Add test for #1565.

[dcpomatic.git] / test / threed_test.cc

diff --git a/test/threed_test.cc b/test/threed_test.cc
index 41d92bc2f9aa9b6e9f699d17ee131177eaa678a9..c749694c60d827c5cad409bf0251a63b41ce7022 100644 (file)
--- a/test/threed_test.cc
+++ b/test/threed_test.cc
@@ -40,9 +40,9 @@ BOOST_AUTO_TEST_CASE (threed_test1)
 {
        shared_ptr<Film> film = new_test_film ("threed_test1");
        film->set_name ("test_film1");
-       shared_ptr<FFmpegContent> c (new FFmpegContent (film, "test/data/test.mp4"));
+       shared_ptr<FFmpegContent> c (new FFmpegContent("test/data/test.mp4"));
        film->examine_and_add_content (c);
-       wait_for_jobs ();
+       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")));
@@ -63,9 +63,9 @@ BOOST_AUTO_TEST_CASE (threed_test2)
 {
        shared_ptr<Film> film = new_test_film ("threed_test2");
        film->set_name ("test_film2");
-       shared_ptr<FFmpegContent> c (new FFmpegContent (film, "test/data/test.mp4"));
+       shared_ptr<FFmpegContent> c (new FFmpegContent("test/data/test.mp4"));
        film->examine_and_add_content (c);
-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());
 
        c->video->set_frame_type (VIDEO_FRAME_TYPE_3D_ALTERNATE);
        c->video->set_scale (VideoContentScale (Ratio::from_id ("185")));
@@ -85,11 +85,11 @@ BOOST_AUTO_TEST_CASE (threed_test2)
 BOOST_AUTO_TEST_CASE (threed_test3)
 {
        shared_ptr<Film> film = new_test_film2 ("threed_test3");
-       shared_ptr<FFmpegContent> L (new FFmpegContent (film, "test/data/test.mp4"));
+       shared_ptr<FFmpegContent> L (new FFmpegContent("test/data/test.mp4"));
        film->examine_and_add_content (L);
-       shared_ptr<FFmpegContent> R (new FFmpegContent (film, "test/data/test.mp4"));
+       shared_ptr<FFmpegContent> R (new FFmpegContent("test/data/test.mp4"));
        film->examine_and_add_content (R);
-       wait_for_jobs ();
+       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);
@@ -104,11 +104,11 @@ BOOST_AUTO_TEST_CASE (threed_test3)
 BOOST_AUTO_TEST_CASE (threed_test4)
 {
        shared_ptr<Film> film = new_test_film2 ("threed_test4");
-       shared_ptr<FFmpegContent> L (new FFmpegContent (film, private_data / "LEFT_TEST_DCP3D4K.mov"));
+       shared_ptr<FFmpegContent> L (new FFmpegContent(private_data / "LEFT_TEST_DCP3D4K.mov"));
        film->examine_and_add_content (L);
-       shared_ptr<FFmpegContent> R (new FFmpegContent (film, private_data / "RIGHT_TEST_DCP3D4K.mov"));
+       shared_ptr<FFmpegContent> R (new FFmpegContent(private_data / "RIGHT_TEST_DCP3D4K.mov"));
        film->examine_and_add_content (R);
-       wait_for_jobs ();
+       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);
@@ -123,11 +123,11 @@ BOOST_AUTO_TEST_CASE (threed_test4)
 BOOST_AUTO_TEST_CASE (threed_test5)
 {
        shared_ptr<Film> film = new_test_film2 ("threed_test5");
-       shared_ptr<FFmpegContent> L (new FFmpegContent (film, private_data / "boon_telly.mkv"));
+       shared_ptr<FFmpegContent> L (new FFmpegContent(private_data / "boon_telly.mkv"));
        film->examine_and_add_content (L);
-       shared_ptr<FFmpegContent> R (new FFmpegContent (film, private_data / "boon_telly.mkv"));
+       shared_ptr<FFmpegContent> R (new FFmpegContent(private_data / "boon_telly.mkv"));
        film->examine_and_add_content (R);
-       wait_for_jobs ();
+       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);
@@ -138,3 +138,40 @@ BOOST_AUTO_TEST_CASE (threed_test5)
 
        BOOST_REQUIRE (!wait_for_jobs ());
 }
+
+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"));
+       film->examine_and_add_content (L);
+       shared_ptr<FFmpegContent> R (new FFmpegContent("test/data/3dR.mp4"));
+       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);
+
+       film->set_three_d (true);
+       film->make_dcp ();
+       film->write_metadata ();
+
+       BOOST_REQUIRE (!wait_for_jobs());
+       check_dcp ("test/data/threed_test6", film->dir(film->dcp_name()));
+}
+
+/** Check 2D content set as being 3D; this fails with a -114 in some versions */
+BOOST_AUTO_TEST_CASE (threed_test7)
+{
+       shared_ptr<Film> film = new_test_film2 ("threed_test7");
+       shared_ptr<FFmpegContent> c (new FFmpegContent("test/data/red_24.mp4"));
+       film->examine_and_add_content (c);
+       BOOST_REQUIRE (!wait_for_jobs());
+
+       c->video->set_frame_type (VIDEO_FRAME_TYPE_3D);
+
+       film->set_three_d (true);
+       film->make_dcp ();
+       film->write_metadata ();
+
+       BOOST_REQUIRE (!wait_for_jobs());
+}