X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fthreed_test.cc;h=f98464fb5810329d20a6a6903ed2b175bc4fb9b6;hb=244ddf0fc0b6466618408fec7b926f517be067c1;hp=8b58e2bfb79c8b850d60998c78572dd58820f7e8;hpb=4a2efeb3c35babad46eebfbb56fa9a0a7c215d3b;p=dcpomatic.git

diff --git a/test/threed_test.cc b/test/threed_test.cc
index 8b58e2bfb..f98464fb5 100644
--- a/test/threed_test.cc
+++ b/test/threed_test.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2019 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,21 +18,24 @@
 
 */
 
+
 /** @file  test/threed_test.cc
  *  @brief Create some 3D DCPs (without comparing the results to anything).
  *  @ingroup completedcp
  */
 
-#include "test.h"
-#include "lib/film.h"
-#include "lib/ratio.h"
+
 #include "lib/config.h"
+#include "lib/content_factory.h"
+#include "lib/cross.h"
 #include "lib/dcp_content_type.h"
 #include "lib/ffmpeg_content.h"
-#include "lib/video_content.h"
-#include "lib/job_manager.h"
-#include "lib/cross.h"
+#include "lib/film.h"
 #include "lib/job.h"
+#include "lib/job_manager.h"
+#include "lib/ratio.h"
+#include "lib/video_content.h"
+#include "test.h"
 #include <boost/test/unit_test.hpp>
 #include <iostream>
 
@@ -56,12 +59,10 @@ BOOST_AUTO_TEST_CASE (threed_test1)
 	film->set_container (Ratio::from_id ("185"));
 	film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TST"));
 	film->set_three_d (true);
-	film->make_dcp ();
-	film->write_metadata ();
-
-	BOOST_REQUIRE (!wait_for_jobs ());
+	make_and_verify_dcp (film);
 }
 
+
 /** Basic sanity check of THREE_D_ALTERNATE; at the moment this is just to make sure
  *  that such a transcode completes without error.
  */
@@ -78,12 +79,10 @@ BOOST_AUTO_TEST_CASE (threed_test2)
 	film->set_container (Ratio::from_id ("185"));
 	film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TST"));
 	film->set_three_d (true);
-	film->make_dcp ();
-	film->write_metadata ();
-
-	BOOST_REQUIRE (!wait_for_jobs ());
+	make_and_verify_dcp (film);
 }
 
+
 /** Basic sanity check of THREE_D_LEFT and THREE_D_RIGHT; at the moment this is just to make sure
  *  that such a transcode completes without error.
  */
@@ -100,12 +99,10 @@ BOOST_AUTO_TEST_CASE (threed_test3)
 	R->video->set_frame_type (VideoFrameType::THREE_D_RIGHT);
 
 	film->set_three_d (true);
-	film->make_dcp ();
-	film->write_metadata ();
-
-	BOOST_REQUIRE (!wait_for_jobs ());
+	make_and_verify_dcp (film);
 }
 
+
 BOOST_AUTO_TEST_CASE (threed_test4)
 {
 	auto film = new_test_film2 ("threed_test4");
@@ -125,12 +122,10 @@ BOOST_AUTO_TEST_CASE (threed_test4)
 	R->set_trim_end (dcpomatic::ContentTime::from_seconds(22));
 
 	film->set_three_d (true);
-	film->make_dcp ();
-	film->write_metadata ();
-
-	BOOST_REQUIRE (!wait_for_jobs ());
+	make_and_verify_dcp (film, {dcp::VerificationNote::Code::INVALID_PICTURE_ASSET_RESOLUTION_FOR_3D});
 }
 
+
 BOOST_AUTO_TEST_CASE (threed_test5)
 {
 	auto film = new_test_film2 ("threed_test5");
@@ -149,12 +144,10 @@ BOOST_AUTO_TEST_CASE (threed_test5)
 	R->set_trim_end (dcpomatic::ContentTime::from_seconds(3 * 60 + 20));
 
 	film->set_three_d (true);
-	film->make_dcp ();
-	film->write_metadata ();
-
-	BOOST_REQUIRE (!wait_for_jobs ());
+	make_and_verify_dcp (film, {dcp::VerificationNote::Code::INVALID_PICTURE_FRAME_RATE_FOR_2K});
 }
 
+
 BOOST_AUTO_TEST_CASE (threed_test6)
 {
 	auto film = new_test_film2 ("threed_test6");
@@ -168,25 +161,24 @@ BOOST_AUTO_TEST_CASE (threed_test6)
 	R->video->set_frame_type (VideoFrameType::THREE_D_RIGHT);
 
 	film->set_three_d (true);
-	film->make_dcp ();
-	film->write_metadata ();
-
-	BOOST_REQUIRE (!wait_for_jobs());
+	make_and_verify_dcp (film);
 	check_dcp ("test/data/threed_test6", film->dir(film->dcp_name()));
 }
 
+
 /** Check 2D content set as being 3D; this should give an informative error */
 BOOST_AUTO_TEST_CASE (threed_test7)
 {
 	using boost::filesystem::path;
 
 	auto film = new_test_film2 ("threed_test7");
-	path const content_path = "test/data/red_24.mp4";
-	auto c = make_shared<FFmpegContent>(content_path);
+	path const content_path = "test/data/flat_red.png";
+	auto c = content_factory(content_path).front();
 	film->examine_and_add_content (c);
 	BOOST_REQUIRE (!wait_for_jobs());
 
 	c->video->set_frame_type (VideoFrameType::THREE_D);
+	c->video->set_length (24);
 
 	film->set_three_d (true);
 	film->make_dcp ();