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 9718898e256547f7df4fd0b8fdbded98f5242a53..6dd40c13e8bf6b8dcd50609e5a92e9245fc2fc1b 100644 (file)
--- a/test/reels_test.cc
+++ b/test/reels_test.cc
@@ -18,6 +18,11 @@
 
 */
 
+/** @file  test/reels_test.cc
+ *  @brief Check manipulation of reels in various ways.
+ *  @ingroup specific
+ */
+
 #include "lib/film.h"
 #include "lib/ratio.h"
 #include "lib/ffmpeg_content.h"
@@ -123,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);
@@ -174,7 +179,7 @@ BOOST_AUTO_TEST_CASE (reels_test3)
        BOOST_CHECK_EQUAL (i->to.get(), 96000 * 3);
        ++i;
        BOOST_CHECK_EQUAL (i->from.get(), 96000 * 3);
-       BOOST_CHECK_EQUAL (i->to.get(), sub->full_length().round_up(film->video_frame_rate()).get());
+       BOOST_CHECK_EQUAL (i->to.get(), sub->full_length().ceil(film->video_frame_rate()).get());
 }
 
 /** Check creation of a multi-reel DCP with a single .srt subtitle file;
@@ -221,3 +226,74 @@ BOOST_AUTO_TEST_CASE (reels_test4)
 
        check_dcp ("test/data/reels_test4", film->dir (film->dcp_name()));
 }
+
+BOOST_AUTO_TEST_CASE (reels_test5)
+{
+       shared_ptr<Film> film = new_test_film ("reels_test4");
+       shared_ptr<DCPContent> dcp (new DCPContent (film, "test/data/reels_test4"));
+       film->examine_and_add_content (dcp);
+       wait_for_jobs ();
+
+       dcp->set_position(DCPTime(123));
+
+       {
+               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)));
+       }
+
+       {
+               dcp->set_trim_start (ContentTime::from_seconds (0.5));
+               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)));
+       }
+
+       {
+               dcp->set_trim_end (ContentTime::from_seconds (0.5));
+               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)));
+       }
+
+       {
+               dcp->set_trim_start (ContentTime::from_seconds (1.5));
+               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)));
+       }
+}
+
+/** 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 ());
+}