Fix incorrect multi-reel subtitle timings (#760) and add test.

diff --git a/ChangeLog b/ChangeLog
index 433563d861a8aa882fd2c811226c843fab855749..351835a3973742be9595359c7bfa4b4daa71f311 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2015-11-27  Carl Hetherington  <cth@carlh.net>
 
+       * Fix incorrect subtitle timings with multi-reel (#760).
+
        * Version 2.5.10 released.
 
 2015-11-27  Carl Hetherington  <cth@carlh.net>

diff --git a/src/lib/reel_writer.cc b/src/lib/reel_writer.cc
index c8d848933a566e040afaa4d611efab346995e8ad..d9870ec6fdef7405ba84b7783f6287aeabf3ab7f 100644 (file)
--- a/src/lib/reel_writer.cc
+++ b/src/lib/reel_writer.cc
@@ -484,7 +484,9 @@ ReelWriter::write (PlayerSubtitles subs)
                }
        }
 
-       for (list<dcp::SubtitleString>::const_iterator i = subs.text.begin(); i != subs.text.end(); ++i) {
-               _subtitle_asset->add (*i);
+       BOOST_FOREACH (dcp::SubtitleString i, subs.text) {
+               i.set_in  (i.in()  - dcp::Time (_period.from.seconds(), i.in().tcr));
+               i.set_out (i.out() - dcp::Time (_period.from.seconds(), i.out().tcr));
+               _subtitle_asset->add (i);
        }
 }

diff --git a/test/data b/test/data
index 12fdba5bf3ba7d5eecb72629a7562e7718af7805..1b4c897bea4f6ca483806c724ccd41dc5375745b 160000 (submodule)
--- 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 a0ad05d5ea06a9cd12c950852644eb370764c79c..12a311fe84629b82d696e0864385c7cdc86781f0 100644 (file)
--- 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> 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<ImageContent> 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<SubRipContent> subs (new SubRipContent (film, "test/data/subrip3.srt"));
+       film->examine_and_add_content (subs);
+       wait_for_jobs ();
+
+       list<DCPTimePeriod> reels = film->reels();
+       BOOST_REQUIRE_EQUAL (reels.size(), 4);
+       list<DCPTimePeriod>::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()));
+}