Adapt reels_test for 4a8151a.

[dcpomatic.git] / test / reels_test.cc

diff --git a/test/reels_test.cc b/test/reels_test.cc
index 79b4c5af2de9983058f67e680543aa0a7aefc6d7..b8a0b0a60851ecff8686786e8a1dead183037d69 100644 (file)
--- a/test/reels_test.cc
+++ b/test/reels_test.cc
@@ -91,6 +91,7 @@ BOOST_AUTO_TEST_CASE (reels_test2)
        shared_ptr<Film> film = new_test_film ("reels_test2");
        film->set_name ("reels_test2");
        film->set_container (Ratio::from_id ("185"));
+       film->set_interop (false);
        film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TST"));
 
        {
@@ -194,6 +195,7 @@ BOOST_AUTO_TEST_CASE (reels_test4)
        film->set_container (Ratio::from_id ("185"));
        film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TST"));
        film->set_reel_type (REELTYPE_BY_VIDEO_CONTENT);
+       film->set_interop (false);
 
        /* 4 piece of 1s-long content */
        shared_ptr<ImageContent> content[4];
@@ -236,16 +238,17 @@ BOOST_AUTO_TEST_CASE (reels_test5)
        film->examine_and_add_content (dcp);
        wait_for_jobs ();
 
-       dcp->set_position(DCPTime(123));
+       /* Set to 2123 but it will be rounded up to the next frame (4000) */
+       dcp->set_position(DCPTime(2123));
 
        {
                list<DCPTimePeriod> p = dcp->reels ();
                BOOST_REQUIRE_EQUAL (p.size(), 4);
                list<DCPTimePeriod>::const_iterator i = p.begin();
-               BOOST_CHECK (*i++ == DCPTimePeriod (DCPTime(123 + 0), DCPTime(123 + 96000)));
-               BOOST_CHECK (*i++ == DCPTimePeriod (DCPTime(123 + 96000), DCPTime(123 + 192000)));
-               BOOST_CHECK (*i++ == DCPTimePeriod (DCPTime(123 + 192000), DCPTime(123 + 288000)));
-               BOOST_CHECK (*i++ == DCPTimePeriod (DCPTime(123 + 288000), DCPTime(123 + 384000)));
+               BOOST_CHECK (*i++ == DCPTimePeriod (DCPTime(4000 + 0), DCPTime(4000 + 96000)));
+               BOOST_CHECK (*i++ == DCPTimePeriod (DCPTime(4000 + 96000), DCPTime(4000 + 192000)));
+               BOOST_CHECK (*i++ == DCPTimePeriod (DCPTime(4000 + 192000), DCPTime(4000 + 288000)));
+               BOOST_CHECK (*i++ == DCPTimePeriod (DCPTime(4000 + 288000), DCPTime(4000 + 384000)));
        }
 
        {
@@ -253,10 +256,10 @@ BOOST_AUTO_TEST_CASE (reels_test5)
                list<DCPTimePeriod> p = dcp->reels ();
                BOOST_REQUIRE_EQUAL (p.size(), 4);
                list<DCPTimePeriod>::const_iterator i = p.begin();
-               BOOST_CHECK (*i++ == DCPTimePeriod (DCPTime(123 + 0), DCPTime(123 + 48000)));
-               BOOST_CHECK (*i++ == DCPTimePeriod (DCPTime(123 + 48000), DCPTime(123 + 144000)));
-               BOOST_CHECK (*i++ == DCPTimePeriod (DCPTime(123 + 144000), DCPTime(123 + 240000)));
-               BOOST_CHECK (*i++ == DCPTimePeriod (DCPTime(123 + 240000), DCPTime(123 + 336000)));
+               BOOST_CHECK (*i++ == DCPTimePeriod (DCPTime(4000 + 0), DCPTime(4000 + 48000)));
+               BOOST_CHECK (*i++ == DCPTimePeriod (DCPTime(4000 + 48000), DCPTime(4000 + 144000)));
+               BOOST_CHECK (*i++ == DCPTimePeriod (DCPTime(4000 + 144000), DCPTime(4000 + 240000)));
+               BOOST_CHECK (*i++ == DCPTimePeriod (DCPTime(4000 + 240000), DCPTime(4000 + 336000)));
        }
 
        {
@@ -264,10 +267,10 @@ BOOST_AUTO_TEST_CASE (reels_test5)
                list<DCPTimePeriod> p = dcp->reels ();
                BOOST_REQUIRE_EQUAL (p.size(), 4);
                list<DCPTimePeriod>::const_iterator i = p.begin();
-               BOOST_CHECK (*i++ == DCPTimePeriod (DCPTime(123 + 0), DCPTime(123 + 48000)));
-               BOOST_CHECK (*i++ == DCPTimePeriod (DCPTime(123 + 48000), DCPTime(123 + 144000)));
-               BOOST_CHECK (*i++ == DCPTimePeriod (DCPTime(123 + 144000), DCPTime(123 + 240000)));
-               BOOST_CHECK (*i++ == DCPTimePeriod (DCPTime(123 + 240000), DCPTime(123 + 288000)));
+               BOOST_CHECK (*i++ == DCPTimePeriod (DCPTime(4000 + 0), DCPTime(4000 + 48000)));
+               BOOST_CHECK (*i++ == DCPTimePeriod (DCPTime(4000 + 48000), DCPTime(4000 + 144000)));
+               BOOST_CHECK (*i++ == DCPTimePeriod (DCPTime(4000 + 144000), DCPTime(4000 + 240000)));
+               BOOST_CHECK (*i++ == DCPTimePeriod (DCPTime(4000 + 240000), DCPTime(4000 + 288000)));
        }
 
        {
@@ -275,9 +278,9 @@ BOOST_AUTO_TEST_CASE (reels_test5)
                list<DCPTimePeriod> p = dcp->reels ();
                BOOST_REQUIRE_EQUAL (p.size(), 3);
                list<DCPTimePeriod>::const_iterator i = p.begin();
-               BOOST_CHECK (*i++ == DCPTimePeriod (DCPTime(123 + 0), DCPTime(123 + 48000)));
-               BOOST_CHECK (*i++ == DCPTimePeriod (DCPTime(123 + 48000), DCPTime(123 + 144000)));
-               BOOST_CHECK (*i++ == DCPTimePeriod (DCPTime(123 + 144000), DCPTime(123 + 192000)));
+               BOOST_CHECK (*i++ == DCPTimePeriod (DCPTime(4000 + 0), DCPTime(4000 + 48000)));
+               BOOST_CHECK (*i++ == DCPTimePeriod (DCPTime(4000 + 48000), DCPTime(4000 + 144000)));
+               BOOST_CHECK (*i++ == DCPTimePeriod (DCPTime(4000 + 144000), DCPTime(4000 + 192000)));
        }
 }
 
@@ -339,7 +342,31 @@ BOOST_AUTO_TEST_CASE (reels_test8)
        BOOST_REQUIRE (!wait_for_jobs ());
 
        A->set_trim_end (ContentTime::from_seconds (1));
-       cout << to_string(A->length_after_trim()) << "\n";
        film->make_dcp ();
        BOOST_REQUIRE (!wait_for_jobs ());
 }
+
+/** Check another reels-related error; make_dcp() would raise a ProgrammingError */
+BOOST_AUTO_TEST_CASE (reels_test9)
+{
+       shared_ptr<Film> film = new_test_film2("reels_test9a");
+       shared_ptr<FFmpegContent> A(new FFmpegContent(film, "test/data/flat_red.png"));
+       film->examine_and_add_content(A);
+       BOOST_REQUIRE(!wait_for_jobs());
+       A->video->set_length(5 * 24);
+       film->set_video_frame_rate(24);
+       film->make_dcp();
+       BOOST_REQUIRE(!wait_for_jobs());
+
+       shared_ptr<Film> film2 = new_test_film2("reels_test9b");
+       shared_ptr<DCPContent> B(new DCPContent(film2, film->dir(film->dcp_name())));
+       film2->examine_and_add_content(B);
+       film2->examine_and_add_content(content_factory(film, "test/data/dcp_sub4.xml").front());
+       B->set_reference_video(true);
+       B->set_reference_audio(true);
+       BOOST_REQUIRE(!wait_for_jobs());
+       film2->set_reel_type(REELTYPE_BY_VIDEO_CONTENT);
+       film2->write_metadata();
+       film2->make_dcp();
+       BOOST_REQUIRE(!wait_for_jobs());
+}