Fix incorrect reel lengths when start-trimmed movie content follows

[dcpomatic.git] / src / lib / dcp_decoder.cc

diff --git a/src/lib/dcp_decoder.cc b/src/lib/dcp_decoder.cc
index ef40f2ec7311949db871dfcaff8ee4db6ed756c4..68aa214ab859e10411af98475a800b2827576ead 100644 (file)
--- a/src/lib/dcp_decoder.cc
+++ b/src/lib/dcp_decoder.cc
@@ -50,16 +50,17 @@ using boost::shared_ptr;
 using boost::dynamic_pointer_cast;
 using boost::optional;
 
-DCPDecoder::DCPDecoder (shared_ptr<const DCPContent> c, shared_ptr<Log> log)
+DCPDecoder::DCPDecoder (shared_ptr<const DCPContent> c, shared_ptr<Log> log, bool fast)
        : DCP (c)
        , _decode_referenced (false)
 {
        video.reset (new VideoDecoder (this, c, log));
        if (c->audio) {
-               audio.reset (new AudioDecoder (this, c->audio, log));
+               audio.reset (new AudioDecoder (this, c->audio, log, fast));
        }
        if (c->subtitle) {
-               subtitle.reset (new SubtitleDecoder (this, c->subtitle, log));
+               /* XXX: this time here should be the time of the first subtitle, not 0 */
+               subtitle.reset (new SubtitleDecoder (this, c->subtitle, log, ContentTime()));
        }
 
        shared_ptr<dcp::CPL> cpl;
@@ -158,6 +159,27 @@ DCPDecoder::pass ()
                audio->emit (_dcp_content->audio->stream(), data, ContentTime::from_frames (_offset, vfr) + _next);
        }
 
+       pass_subtitles (_next);
+
+       _next += ContentTime::from_frames (1, vfr);
+
+       if ((*_reel)->main_picture ()) {
+               if (_next.frames_round (vfr) >= (*_reel)->main_picture()->duration()) {
+                       next_reel ();
+                       _next = ContentTime ();
+               }
+       }
+
+       return false;
+}
+
+void
+DCPDecoder::pass_subtitles (ContentTime next)
+{
+       double const vfr = _dcp_content->active_video_frame_rate ();
+       /* Frame within the (played part of the) reel that is coming up next */
+       int64_t const frame = next.frames_round (vfr);
+
        if ((*_reel)->main_subtitle() && (_decode_referenced || !_dcp_content->reference_subtitle())) {
                int64_t const entry_point = (*_reel)->main_subtitle()->entry_point ();
                list<dcp::SubtitleString> subs = (*_reel)->main_subtitle()->asset()->subtitles_during (
@@ -166,28 +188,18 @@ DCPDecoder::pass ()
                        true
                        );
 
-               if (!subs.empty ()) {
-                       /* XXX: assuming that all `subs' are at the same time; maybe this is ok */
+               BOOST_FOREACH (dcp::SubtitleString i, subs) {
+                       list<dcp::SubtitleString> s;
+                       s.push_back (i);
                        subtitle->emit_text (
                                ContentTimePeriod (
-                                       ContentTime::from_frames (_offset - entry_point, vfr) + ContentTime::from_seconds (subs.front().in().as_seconds ()),
-                                       ContentTime::from_frames (_offset - entry_point, vfr) + ContentTime::from_seconds (subs.front().out().as_seconds ())
+                                       ContentTime::from_frames (_offset - entry_point, vfr) + ContentTime::from_seconds (i.in().as_seconds ()),
+                                       ContentTime::from_frames (_offset - entry_point, vfr) + ContentTime::from_seconds (i.out().as_seconds ())
                                        ),
-                               subs
+                               s
                                );
                }
        }
-
-       _next += ContentTime::from_frames (1, vfr);
-
-       if ((*_reel)->main_picture ()) {
-               if (_next.frames_round (vfr) >= (*_reel)->main_picture()->duration()) {
-                       next_reel ();
-                       _next = ContentTime ();
-               }
-       }
-
-       return false;
 }
 
 void
@@ -241,6 +253,34 @@ DCPDecoder::seek (ContentTime t, bool accurate)
        _offset = 0;
        get_readers ();
 
+       if (accurate) {
+               int const pre_roll_seconds = 2;
+
+               /* Pre-roll for subs */
+
+               ContentTime pre = t - ContentTime::from_seconds (pre_roll_seconds);
+               if (pre < ContentTime()) {
+                       pre = ContentTime ();
+               }
+
+               /* Seek to pre-roll position */
+
+               while (_reel != _reels.end() && pre >= ContentTime::from_frames ((*_reel)->main_picture()->duration(), _dcp_content->active_video_frame_rate ())) {
+                       pre -= ContentTime::from_frames ((*_reel)->main_picture()->duration(), _dcp_content->active_video_frame_rate ());
+                       next_reel ();
+               }
+
+               /* Pass subtitles in the pre-roll */
+
+               double const vfr = _dcp_content->active_video_frame_rate ();
+               for (int i = 0; i < pre_roll_seconds * vfr; ++i) {
+                       pass_subtitles (pre);
+                       pre += ContentTime::from_frames (1, vfr);
+               }
+       }
+
+       /* Seek to correct position */
+
        while (_reel != _reels.end() && t >= ContentTime::from_frames ((*_reel)->main_picture()->duration(), _dcp_content->active_video_frame_rate ())) {
                t -= ContentTime::from_frames ((*_reel)->main_picture()->duration(), _dcp_content->active_video_frame_rate ());
                next_reel ();