using std::list;
using std::cout;
using boost::shared_ptr;
+using namespace dcpomatic;
/** Test Film::reels() */
BOOST_AUTO_TEST_CASE (reels_test1)
film->examine_and_add_content (A);
shared_ptr<FFmpegContent> B (new FFmpegContent("test/data/test.mp4"));
film->examine_and_add_content (B);
- wait_for_jobs ();
+ BOOST_REQUIRE (!wait_for_jobs());
BOOST_CHECK_EQUAL (A->full_length(film).get(), 288000);
film->set_reel_type (REELTYPE_SINGLE);
{
shared_ptr<ImageContent> c (new ImageContent("test/data/flat_red.png"));
film->examine_and_add_content (c);
- wait_for_jobs ();
+ BOOST_REQUIRE (!wait_for_jobs());
c->video->set_length (24);
}
{
shared_ptr<ImageContent> c (new ImageContent("test/data/flat_green.png"));
film->examine_and_add_content (c);
- wait_for_jobs ();
+ BOOST_REQUIRE (!wait_for_jobs());
c->video->set_length (24);
}
{
shared_ptr<ImageContent> c (new ImageContent("test/data/flat_blue.png"));
film->examine_and_add_content (c);
- wait_for_jobs ();
+ BOOST_REQUIRE (!wait_for_jobs());
c->video->set_length (24);
}
film->set_reel_type (REELTYPE_BY_VIDEO_CONTENT);
- wait_for_jobs ();
+ BOOST_REQUIRE (!wait_for_jobs());
film->make_dcp ();
- wait_for_jobs ();
+ BOOST_REQUIRE (!wait_for_jobs());
check_dcp ("test/data/reels_test2", film->dir (film->dcp_name()));
c->set_reference_audio (true);
film2->make_dcp ();
- wait_for_jobs ();
+ BOOST_REQUIRE (!wait_for_jobs());
}
/** Check that REELTYPE_BY_VIDEO_CONTENT adds an extra reel, if necessary, at the end
film->examine_and_add_content (dcp);
shared_ptr<Content> sub (new StringTextFileContent("test/data/subrip.srt"));
film->examine_and_add_content (sub);
- wait_for_jobs ();
+ BOOST_REQUIRE (!wait_for_jobs());
list<DCPTimePeriod> reels = film->reels();
BOOST_REQUIRE_EQUAL (reels.size(), 4);
for (int i = 0; i < 4; ++i) {
content[i].reset (new ImageContent("test/data/flat_green.png"));
film->examine_and_add_content (content[i]);
- wait_for_jobs ();
+ BOOST_REQUIRE (!wait_for_jobs());
content[i]->video->set_length (24);
}
shared_ptr<StringTextFileContent> subs (new StringTextFileContent("test/data/subrip3.srt"));
film->examine_and_add_content (subs);
- wait_for_jobs ();
+ BOOST_REQUIRE (!wait_for_jobs());
list<DCPTimePeriod> reels = film->reels();
BOOST_REQUIRE_EQUAL (reels.size(), 4);
BOOST_CHECK_EQUAL (i->to.get(), 96000 * 4);
film->make_dcp ();
- wait_for_jobs ();
+ BOOST_REQUIRE (!wait_for_jobs());
check_dcp ("test/data/reels_test4", film->dir (film->dcp_name()));
}
film2->make_dcp();
BOOST_REQUIRE(!wait_for_jobs());
}
+
+/** Another reels-related error; make_dcp() would raise a ProgrammingError
+ * in AudioBuffers::allocate due to an attempt to allocate a negatively-sized buffer.
+ * This was triggered by a VF where there are referenced audio reels followed by
+ * VF audio. When the VF audio arrives the Writer did not correctly skip over the
+ * referenced reels.
+ */
+BOOST_AUTO_TEST_CASE (reels_test10)
+{
+ /* Make the OV */
+ shared_ptr<Film> ov = new_test_film2("reels_test10_ov");
+ shared_ptr<FFmpegContent> A(new FFmpegContent("test/data/flat_red.png"));
+ ov->examine_and_add_content (A);
+ BOOST_REQUIRE (!wait_for_jobs());
+ A->video->set_length (5 * 24);
+
+ shared_ptr<FFmpegContent> B(new FFmpegContent("test/data/flat_red.png"));
+ ov->examine_and_add_content (B);
+ BOOST_REQUIRE (!wait_for_jobs());
+ B->video->set_length (5 * 24);
+
+ ov->set_reel_type (REELTYPE_BY_VIDEO_CONTENT);
+ ov->make_dcp ();
+ BOOST_REQUIRE (!wait_for_jobs());
+ ov->write_metadata ();
+
+ /* Now try to make the VF; this used to fail */
+ shared_ptr<Film> vf = new_test_film2("reels_test10_vf");
+ shared_ptr<DCPContent> ov_dcp(new DCPContent(ov->dir(ov->dcp_name())));
+ vf->examine_and_add_content (ov_dcp);
+ BOOST_REQUIRE (!wait_for_jobs());
+ vf->set_reel_type (REELTYPE_BY_VIDEO_CONTENT);
+ ov_dcp->set_reference_video (true);
+ ov_dcp->set_reference_audio (true);
+ vf->examine_and_add_content (content_factory("test/data/15s.srt").front());
+ BOOST_REQUIRE (!wait_for_jobs());
+
+ vf->make_dcp ();
+ BOOST_REQUIRE (!wait_for_jobs());
+ vf->write_metadata ();
+}