X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fthreed_test.cc;h=cda278a59702506a654392aaf3c4d8b8897723fd;hb=ea63ad9560757e56505551db3bf2e1c31be5c76c;hp=78e656830b65158afde56a2a8ca1e12b613fcc87;hpb=8fedaaa75c4586a4cc7ffb393bd71d1fdb091dc8;p=dcpomatic.git

diff --git a/test/threed_test.cc b/test/threed_test.cc
index 78e656830..cda278a59 100644
--- a/test/threed_test.cc
+++ b/test/threed_test.cc
@@ -36,15 +36,18 @@
 #include <boost/test/unit_test.hpp>
 #include <iostream>
 
+
 using std::cout;
+using std::make_shared;
 using std::shared_ptr;
 
+
 /** Basic sanity check of THREE_D_LEFT_RIGHT */
 BOOST_AUTO_TEST_CASE (threed_test1)
 {
-	shared_ptr<Film> film = new_test_film ("threed_test1");
+	auto film = new_test_film ("threed_test1");
 	film->set_name ("test_film1");
-	shared_ptr<FFmpegContent> c (new FFmpegContent("test/data/test.mp4"));
+	auto c = make_shared<FFmpegContent>("test/data/test.mp4");
 	film->examine_and_add_content (c);
 	BOOST_REQUIRE (!wait_for_jobs());
 
@@ -53,20 +56,18 @@ 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.
  */
 BOOST_AUTO_TEST_CASE (threed_test2)
 {
-	shared_ptr<Film> film = new_test_film ("threed_test2");
+	auto film = new_test_film ("threed_test2");
 	film->set_name ("test_film2");
-	shared_ptr<FFmpegContent> c (new FFmpegContent("test/data/test.mp4"));
+	auto c = make_shared<FFmpegContent>("test/data/test.mp4");
 	film->examine_and_add_content (c);
 	BOOST_REQUIRE (!wait_for_jobs());
 
@@ -75,21 +76,19 @@ 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.
  */
 BOOST_AUTO_TEST_CASE (threed_test3)
 {
 	shared_ptr<Film> film = new_test_film2 ("threed_test3");
-	shared_ptr<FFmpegContent> L (new FFmpegContent("test/data/test.mp4"));
+	auto L = make_shared<FFmpegContent>("test/data/test.mp4");
 	film->examine_and_add_content (L);
-	shared_ptr<FFmpegContent> R (new FFmpegContent("test/data/test.mp4"));
+	auto R = make_shared<FFmpegContent>("test/data/test.mp4");
 	film->examine_and_add_content (R);
 	BOOST_REQUIRE (!wait_for_jobs());
 
@@ -97,18 +96,16 @@ 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)
 {
-	shared_ptr<Film> film = new_test_film2 ("threed_test4");
-	shared_ptr<FFmpegContent> L (new FFmpegContent(TestPaths::private_data() / "LEFT_TEST_DCP3D4K.mov"));
+	auto film = new_test_film2 ("threed_test4");
+	auto L = make_shared<FFmpegContent>(TestPaths::private_data() / "LEFT_TEST_DCP3D4K.mov");
 	film->examine_and_add_content (L);
-	shared_ptr<FFmpegContent> R (new FFmpegContent(TestPaths::private_data() / "RIGHT_TEST_DCP3D4K.mov"));
+	auto R = make_shared<FFmpegContent>(TestPaths::private_data() / "RIGHT_TEST_DCP3D4K.mov");
 	film->examine_and_add_content (R);
 	BOOST_REQUIRE (!wait_for_jobs());
 
@@ -122,18 +119,16 @@ 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)
 {
-	shared_ptr<Film> film = new_test_film2 ("threed_test5");
-	shared_ptr<FFmpegContent> L (new FFmpegContent(TestPaths::private_data() / "boon_telly.mkv"));
+	auto film = new_test_film2 ("threed_test5");
+	auto L = make_shared<FFmpegContent>(TestPaths::private_data() / "boon_telly.mkv");
 	film->examine_and_add_content (L);
-	shared_ptr<FFmpegContent> R (new FFmpegContent(TestPaths::private_data() / "boon_telly.mkv"));
+	auto R = make_shared<FFmpegContent>(TestPaths::private_data() / "boon_telly.mkv");
 	film->examine_and_add_content (R);
 	BOOST_REQUIRE (!wait_for_jobs());
 
@@ -146,18 +141,16 @@ 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)
 {
-	shared_ptr<Film> film = new_test_film2 ("threed_test6");
-	shared_ptr<FFmpegContent> L (new FFmpegContent("test/data/3dL.mp4"));
+	auto film = new_test_film2 ("threed_test6");
+	auto L = make_shared<FFmpegContent>("test/data/3dL.mp4");
 	film->examine_and_add_content (L);
-	shared_ptr<FFmpegContent> R (new FFmpegContent("test/data/3dR.mp4"));
+	auto R = make_shared<FFmpegContent>("test/data/3dR.mp4");
 	film->examine_and_add_content (R);
 	BOOST_REQUIRE (!wait_for_jobs());
 
@@ -165,21 +158,19 @@ 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;
 
-	shared_ptr<Film> film = new_test_film2 ("threed_test7");
+	auto film = new_test_film2 ("threed_test7");
 	path const content_path = "test/data/red_24.mp4";
-	shared_ptr<FFmpegContent> c (new FFmpegContent(content_path));
+	auto c = make_shared<FFmpegContent>(content_path);
 	film->examine_and_add_content (c);
 	BOOST_REQUIRE (!wait_for_jobs());
 
@@ -189,7 +180,7 @@ BOOST_AUTO_TEST_CASE (threed_test7)
 	film->make_dcp ();
 	film->write_metadata ();
 
-	JobManager* jm = JobManager::instance ();
+	auto jm = JobManager::instance ();
 	while (jm->work_to_do ()) {
 		while (signal_manager->ui_idle()) {}
 		dcpomatic_sleep_seconds (1);
@@ -197,11 +188,6 @@ BOOST_AUTO_TEST_CASE (threed_test7)
 
 	while (signal_manager->ui_idle ()) {}
 
-	std::cout << "Here's the jobs:\n";
-	for (auto i: jm->_jobs) {
-		std::cout << i->name() << " " << i->status() << " " << i->is_new() << " " << i->running() << " " << i->finished() << " " << i->finished_ok() << " " << i->finished_in_error() << "\n";
-	}
-
 	BOOST_REQUIRE (jm->errors());
 	shared_ptr<Job> failed;
 	for (auto i: jm->_jobs) {