Add test for #1565.

Forward-ported from c3cccfcf0f3942a55f1c0df5ba623fcfa360533e in master.

diff --git a/test/threed_test.cc b/test/threed_test.cc
index a9dd21c96fc721bd51ae88c71a599415a46fd4be..c749694c60d827c5cad409bf0251a63b41ce7022 100644 (file)
--- a/test/threed_test.cc
+++ b/test/threed_test.cc
@@ -158,3 +158,20 @@ BOOST_AUTO_TEST_CASE (threed_test6)
        BOOST_REQUIRE (!wait_for_jobs());
        check_dcp ("test/data/threed_test6", film->dir(film->dcp_name()));
 }
        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());
+}