Supporters update.

[dcpomatic.git] / test / 4k_test.cc

diff --git a/test/4k_test.cc b/test/4k_test.cc
index 033796ab23d2e65cc58c5461ec6316765a3eb95f..9e80a6e27bb035c25e940fd8dccf3d9b060a57fc 100644 (file)
--- a/test/4k_test.cc
+++ b/test/4k_test.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,40 +18,55 @@
 
 */
 
+
+/** @defgroup completedcp Complete builds of DCPs */
+
 /** @file  test/4k_test.cc
  *  @brief Run a 4K encode from a simple input.
+ *  @ingroup completedcp
  *
  *  The output is checked against test/data/4k_test.
  */
 
-#include <boost/test/unit_test.hpp>
-#include "lib/film.h"
-#include "lib/ffmpeg_content.h"
+
 #include "lib/dcp_content_type.h"
-#include "lib/video_content.h"
+#include "lib/dcpomatic_log.h"
+#include "lib/ffmpeg_content.h"
+#include "lib/film.h"
 #include "lib/ratio.h"
+#include "lib/video_content.h"
 #include "test.h"
+#include <boost/test/unit_test.hpp>
+
+
+using std::make_shared;
 
-using boost::shared_ptr;
 
 BOOST_AUTO_TEST_CASE (fourk_test)
 {
-       shared_ptr<Film> film = new_test_film ("4k_test");
+       auto film = new_test_film ("4k_test");
+       LogSwitcher ls (film->log());
        film->set_name ("4k_test");
-       shared_ptr<FFmpegContent> c (new FFmpegContent (film, "test/data/test.mp4"));
-       film->set_resolution (RESOLUTION_4K);
+       auto c = make_shared<FFmpegContent>("test/data/test.mp4");
+       film->set_resolution (Resolution::FOUR_K);
        film->set_dcp_content_type (DCPContentType::from_isdcf_name ("FTR"));
        film->set_container (Ratio::from_id ("185"));
        film->examine_and_add_content (c);
-       wait_for_jobs ();
-
-       c->video->set_scale (VideoContentScale (Ratio::from_id ("185")));
+       BOOST_REQUIRE (!wait_for_jobs());
 
-       film->make_dcp ();
-       wait_for_jobs ();
+       make_and_verify_dcp (
+               film,
+               {
+                       dcp::VerificationNote::Code::MISSING_FFMC_IN_FEATURE,
+                       dcp::VerificationNote::Code::MISSING_FFEC_IN_FEATURE
+               });
 
-       boost::filesystem::path p (test_film_dir ("4k_test"));
+       boost::filesystem::path p (test_film_dir("4k_test"));
        p /= film->dcp_name ();
 
-       check_dcp ("test/data/4k_test", p.string ());
+       /* This test is concerned with the image and its metadata, so we'll
+        * ignore any differences in sound between the DCP and the reference to
+        * avoid test failures for unrelated reasons.
+        */
+       check_dcp("test/data/4k_test", p.string(), true);
 }