Fix crazy thinko in Rect::extend() causing subtitles to disappear when they were...

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

diff --git a/src/lib/dcp_decoder.cc b/src/lib/dcp_decoder.cc
index 23b8347676c54b37ea528931ecd72204b058b79a..0250fa9fef31a7a73fd969c9c0a6afd59f236de1 100644 (file)
--- a/src/lib/dcp_decoder.cc
+++ b/src/lib/dcp_decoder.cc
@@ -77,6 +77,8 @@ DCPDecoder::DCPDecoder (shared_ptr<const DCPContent> c, shared_ptr<Log> log, boo
                cpl = cpls().front ();
        }
 
+       set_decode_referenced (false);
+
        _reels = cpl->reels ();
 
        _reel = _reels.begin ();
@@ -84,6 +86,7 @@ DCPDecoder::DCPDecoder (shared_ptr<const DCPContent> c, shared_ptr<Log> log, boo
        get_readers ();
 }
 
+
 bool
 DCPDecoder::pass ()
 {
@@ -96,6 +99,11 @@ DCPDecoder::pass ()
        /* Frame within the (played part of the) reel that is coming up next */
        int64_t const frame = _next.frames_round (vfr);
 
+       /* We must emit subtitles first as when we emit the video for this frame
+          it will expect already to have the subs.
+       */
+       pass_subtitles (_next);
+
        if ((_mono_reader || _stereo_reader) && (_decode_referenced || !_dcp_content->reference_video())) {
                shared_ptr<dcp::PictureAsset> asset = (*_reel)->main_picture()->asset ();
                int64_t const entry_point = (*_reel)->main_picture()->entry_point ();
@@ -159,8 +167,6 @@ 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 ()) {
@@ -189,12 +195,14 @@ DCPDecoder::pass_subtitles (ContentTime next)
                        );
 
                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 (i.in().as_seconds ()),
                                        ContentTime::from_frames (_offset - entry_point, vfr) + ContentTime::from_seconds (i.out().as_seconds ())
                                        ),
-                               subs
+                               s
                                );
                }
        }
@@ -245,36 +253,40 @@ DCPDecoder::get_readers ()
 void
 DCPDecoder::seek (ContentTime t, bool accurate)
 {
+       if (!_dcp_content->can_be_played ()) {
+               return;
+       }
+
        Decoder::seek (t, accurate);
 
        _reel = _reels.begin ();
        _offset = 0;
        get_readers ();
 
-       if (accurate) {
-               int const pre_roll_seconds = 2;
+       int const pre_roll_seconds = 2;
 
-               /* Pre-roll for subs */
+       /* Pre-roll for subs */
 
-               ContentTime pre = t - ContentTime::from_seconds (pre_roll_seconds);
-               if (pre < ContentTime()) {
-                       pre = ContentTime ();
-               }
+       ContentTime pre = t - ContentTime::from_seconds (pre_roll_seconds);
+       if (pre < ContentTime()) {
+               pre = ContentTime ();
+       }
 
-               /* Seek to pre-roll position */
+       /* 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 ();
-               }
+       while (_reel != _reels.end() && pre >= ContentTime::from_frames ((*_reel)->main_picture()->duration(), _dcp_content->active_video_frame_rate ())) {
+               ContentTime rd = ContentTime::from_frames ((*_reel)->main_picture()->duration(), _dcp_content->active_video_frame_rate ());
+               pre -= rd;
+               t -= rd;
+               next_reel ();
+       }
 
-               /* Pass subtitles in the pre-roll */
+       /* 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);
-               }
+       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 */
@@ -288,9 +300,12 @@ DCPDecoder::seek (ContentTime t, bool accurate)
 }
 
 void
-DCPDecoder::set_decode_referenced ()
+DCPDecoder::set_decode_referenced (bool r)
 {
-       _decode_referenced = true;
+       _decode_referenced = r;
+
+       video->set_ignore (_dcp_content->reference_video() && !_decode_referenced);
+       audio->set_ignore (_dcp_content->reference_audio() && !_decode_referenced);
 }
 
 void