From e755db433d8d74854c1c65690261adbcf377ca11 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 27 Nov 2015 20:52:16 +0000 Subject: Fix incorrect multi-reel subtitle timings (#760) and add test. --- test/data | 2 +- test/reels_test.cc | 45 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+), 1 deletion(-) (limited to 'test') diff --git a/test/data b/test/data index 12fdba5bf..1b4c897be 160000 --- a/test/data +++ b/test/data @@ -1 +1 @@ -Subproject commit 12fdba5bf3ba7d5eecb72629a7562e7718af7805 +Subproject commit 1b4c897bea4f6ca483806c724ccd41dc5375745b diff --git a/test/reels_test.cc b/test/reels_test.cc index a0ad05d5e..12a311fe8 100644 --- a/test/reels_test.cc +++ b/test/reels_test.cc @@ -177,3 +177,48 @@ BOOST_AUTO_TEST_CASE (reels_test3) BOOST_CHECK_EQUAL (i->from, DCPTime (96000 * 3)); BOOST_CHECK_EQUAL (i->to, sub->full_length().round_up (film->video_frame_rate())); } + +/** Check creation of a multi-reel DCP with a single .srt subtitle file; + * make sure that the reel subtitle timing is done right. + */ +BOOST_AUTO_TEST_CASE (reels_test4) +{ + shared_ptr film = new_test_film ("reels_test4"); + film->set_name ("reels_test4"); + film->set_container (Ratio::from_id ("185")); + film->set_dcp_content_type (DCPContentType::from_pretty_name ("Test")); + film->set_reel_type (REELTYPE_BY_VIDEO_CONTENT); + + /* 4 piece of 1s-long content */ + shared_ptr content[4]; + for (int i = 0; i < 4; ++i) { + content[i].reset (new ImageContent (film, "test/data/flat_green.png")); + film->examine_and_add_content (content[i]); + wait_for_jobs (); + content[i]->set_video_length (24); + } + + shared_ptr subs (new SubRipContent (film, "test/data/subrip3.srt")); + film->examine_and_add_content (subs); + wait_for_jobs (); + + list reels = film->reels(); + BOOST_REQUIRE_EQUAL (reels.size(), 4); + list::const_iterator i = reels.begin (); + BOOST_CHECK_EQUAL (i->from, DCPTime (0)); + BOOST_CHECK_EQUAL (i->to, DCPTime (96000)); + ++i; + BOOST_CHECK_EQUAL (i->from, DCPTime (96000)); + BOOST_CHECK_EQUAL (i->to, DCPTime (96000 * 2)); + ++i; + BOOST_CHECK_EQUAL (i->from, DCPTime (96000 * 2)); + BOOST_CHECK_EQUAL (i->to, DCPTime (96000 * 3)); + ++i; + BOOST_CHECK_EQUAL (i->from, DCPTime (96000 * 3)); + BOOST_CHECK_EQUAL (i->to, DCPTime (96000 * 4)); + + film->make_dcp (); + wait_for_jobs (); + + check_dcp ("test/data/reels_test4", film->dir (film->dcp_name())); +} -- cgit v1.2.3