Difficult to see how any unprotected write with multiple readers

[dcpomatic.git] / test / threed_test.cc

diff --git a/test/threed_test.cc b/test/threed_test.cc
index c8735617184d52fb116845190f80ce31b83743b9..ce1df88e381ce32404e3420a7634f9c370682b1e 100644 (file)
--- a/test/threed_test.cc
+++ b/test/threed_test.cc
@@ -49,7 +49,6 @@ BOOST_AUTO_TEST_CASE (threed_test1)
        BOOST_REQUIRE (!wait_for_jobs());
 
        c->video->set_frame_type (VIDEO_FRAME_TYPE_3D_LEFT_RIGHT);
-       c->video->set_scale (VideoContentScale (Ratio::from_id ("185")));
 
        film->set_container (Ratio::from_id ("185"));
        film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TST"));
@@ -72,7 +71,6 @@ BOOST_AUTO_TEST_CASE (threed_test2)
        BOOST_REQUIRE (!wait_for_jobs());
 
        c->video->set_frame_type (VIDEO_FRAME_TYPE_3D_ALTERNATE);
-       c->video->set_scale (VideoContentScale (Ratio::from_id ("185")));
 
        film->set_container (Ratio::from_id ("185"));
        film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TST"));
@@ -107,48 +105,51 @@ 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(private_data / "LEFT_TEST_DCP3D4K.mov"));
+       shared_ptr<FFmpegContent> L (new FFmpegContent(TestPaths::private_data / "LEFT_TEST_DCP3D4K.mov"));
        film->examine_and_add_content (L);
-       shared_ptr<FFmpegContent> R (new FFmpegContent(private_data / "RIGHT_TEST_DCP3D4K.mov"));
+       shared_ptr<FFmpegContent> R (new FFmpegContent(TestPaths::private_data / "RIGHT_TEST_DCP3D4K.mov"));
        film->examine_and_add_content (R);
        BOOST_REQUIRE (!wait_for_jobs());
 
        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(private_data / "boon_telly.mkv"));
+       shared_ptr<FFmpegContent> L (new FFmpegContent(TestPaths::private_data / "boon_telly.mkv"));
        film->examine_and_add_content (L);
-       shared_ptr<FFmpegContent> R (new FFmpegContent(private_data / "boon_telly.mkv"));
+       shared_ptr<FFmpegContent> R (new FFmpegContent(TestPaths::private_data / "boon_telly.mkv"));
        film->examine_and_add_content (R);
        BOOST_REQUIRE (!wait_for_jobs());
 
        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)