X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fthreed_test.cc;h=ce1df88e381ce32404e3420a7634f9c370682b1e;hb=refs%2Fheads%2Fenable-mov-audio-streams;hp=266b7bf58d7811c9d60529540f86884b716aa833;hpb=4edc14c8b1410e24f68b510cc14409b96c0338a3;p=dcpomatic.git

diff --git a/test/threed_test.cc b/test/threed_test.cc
index 266b7bf58..ce1df88e3 100644
--- a/test/threed_test.cc
+++ b/test/threed_test.cc
@@ -105,8 +105,6 @@ BOOST_AUTO_TEST_CASE (threed_test3)
 
 BOOST_AUTO_TEST_CASE (threed_test4)
 {
-	Config::instance()->set_master_encoding_threads (8);
-
 	shared_ptr<Film> film = new_test_film2 ("threed_test4");
 	shared_ptr<FFmpegContent> L (new FFmpegContent(TestPaths::private_data / "LEFT_TEST_DCP3D4K.mov"));
 	film->examine_and_add_content (L);
@@ -116,20 +114,22 @@ BOOST_AUTO_TEST_CASE (threed_test4)
 
 	L->video->set_frame_type (VIDEO_FRAME_TYPE_3D_LEFT);
 	R->video->set_frame_type (VIDEO_FRAME_TYPE_3D_RIGHT);
+	/* There doesn't seem much point in encoding the whole input, especially as we're only
+	 * checking for errors during the encode and not the result.  Also decoding these files
+	 * (4K HQ Prores) is very slow.
+	 */
+	L->set_trim_end (dcpomatic::ContentTime::from_seconds(22));
+	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 ());
-
-	Config::instance()->set_master_encoding_threads (8);
 }
 
 BOOST_AUTO_TEST_CASE (threed_test5)
 {
-	Config::instance()->set_master_encoding_threads (8);
-
 	shared_ptr<Film> film = new_test_film2 ("threed_test5");
 	shared_ptr<FFmpegContent> L (new FFmpegContent(TestPaths::private_data / "boon_telly.mkv"));
 	film->examine_and_add_content (L);
@@ -139,14 +139,17 @@ BOOST_AUTO_TEST_CASE (threed_test5)
 
 	L->video->set_frame_type (VIDEO_FRAME_TYPE_3D_LEFT);
 	R->video->set_frame_type (VIDEO_FRAME_TYPE_3D_RIGHT);
+	/* There doesn't seem much point in encoding the whole input, especially as we're only
+	 * checking for errors during the encode and not the result.
+	 */
+	L->set_trim_end (dcpomatic::ContentTime::from_seconds(3 * 60 + 20));
+	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 ());
-
-	Config::instance()->set_master_encoding_threads (1);
 }
 
 BOOST_AUTO_TEST_CASE (threed_test6)