Fix incorrect audio MXFs when writing multiple reels.

[dcpomatic.git] / test / reels_test.cc

diff --git a/test/reels_test.cc b/test/reels_test.cc
index a9ed07e73aadfe6c01f19755498151f4ba6d5c85..6dd40c13e8bf6b8dcd50609e5a92e9245fc2fc1b 100644 (file)
--- a/test/reels_test.cc
+++ b/test/reels_test.cc
@@ -128,7 +128,7 @@ BOOST_AUTO_TEST_CASE (reels_test2)
 
        shared_ptr<DCPContent> c (new DCPContent (film2, film->dir (film->dcp_name ())));
        film2->examine_and_add_content (c);
-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs ());
 
        list<DCPTimePeriod> r = film2->reels ();
        BOOST_CHECK_EQUAL (r.size(), 3);
@@ -278,3 +278,22 @@ BOOST_AUTO_TEST_CASE (reels_test5)
                BOOST_CHECK (*i++ == DCPTimePeriod (DCPTime(123 + 144000), DCPTime(123 + 192000)));
        }
 }
+
+/** Check reel split with a muxed video/audio source */
+BOOST_AUTO_TEST_CASE (reels_test6)
+{
+       shared_ptr<Film> film = new_test_film ("reels_test6");
+       film->set_name ("reels_test6");
+       film->set_container (Ratio::from_id ("185"));
+       film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TST"));
+       shared_ptr<FFmpegContent> A (new FFmpegContent (film, "test/data/test2.mp4"));
+       film->examine_and_add_content (A);
+       BOOST_REQUIRE (!wait_for_jobs ());
+
+       film->set_j2k_bandwidth (100000000);
+       film->set_reel_type (REELTYPE_BY_LENGTH);
+       /* This is just over 2.5s at 100Mbit/s; should correspond to 60 frames */
+       film->set_reel_length (31253154);
+       film->make_dcp ();
+       BOOST_REQUIRE (!wait_for_jobs ());
+}