X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Freels_test.cc;h=6dd40c13e8bf6b8dcd50609e5a92e9245fc2fc1b;hb=7a6b206783fd44735679f8c7ea542b42e1a4dbd6;hp=1951d53748a8f9b4cfeda161c8b83fb3d0fd6bed;hpb=c8be0644833dce6ff39202430bba0ab358f3e096;p=dcpomatic.git

diff --git a/test/reels_test.cc b/test/reels_test.cc
index 1951d5374..6dd40c13e 100644
--- 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);
@@ -273,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 ());
+}