Reasonably straightforward stuff; main things are adding

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

diff --git a/src/lib/dcp_decoder.cc b/src/lib/dcp_decoder.cc
index ada0d01d1db617dabf66f117f92971e008102776..e8c64a086012742e1fe3c4fe3c8bfe3320ece87c 100644 (file)
--- a/src/lib/dcp_decoder.cc
+++ b/src/lib/dcp_decoder.cc
@@ -42,14 +42,14 @@ using std::cout;
 using boost::shared_ptr;
 using boost::dynamic_pointer_cast;
 
-DCPDecoder::DCPDecoder (shared_ptr<const DCPContent> c, bool fast)
-       : VideoDecoder (c)
+DCPDecoder::DCPDecoder (shared_ptr<const DCPContent> c, shared_ptr<Log> log, bool fast)
+       : VideoDecoder (c->video, log)
        , AudioDecoder (c, fast)
        , SubtitleDecoder (c)
        , _dcp_content (c)
 {
        dcp::DCP dcp (c->directory ());
-       dcp.read ();
+       dcp.read (false, 0, true);
        if (c->kdm ()) {
                dcp.add (dcp::DecryptedKDM (c->kdm().get (), Config::instance()->decryption_chain()->key().get ()));
        }
@@ -59,13 +59,23 @@ DCPDecoder::DCPDecoder (shared_ptr<const DCPContent> c, bool fast)
 }
 
 bool
-DCPDecoder::pass (PassReason reason)
+DCPDecoder::pass (PassReason reason, bool)
 {
        if (_reel == _reels.end () || !_dcp_content->can_be_played ()) {
                return true;
        }
 
-       double const vfr = _dcp_content->video_frame_rate ();
+       /* Offset of the start of the current reel from the start of the content in frames */
+       int offset = 0;
+       list<shared_ptr<dcp::Reel> >::const_iterator i = _reels.begin();
+       while (i != _reel) {
+               offset += (*i)->main_picture()->duration ();
+               ++i;
+       }
+
+       double const vfr = _dcp_content->video->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_picture () && reason != PASS_REASON_SUBTITLE) {
@@ -74,16 +84,16 @@ DCPDecoder::pass (PassReason reason)
                shared_ptr<dcp::StereoPictureAsset> stereo = dynamic_pointer_cast<dcp::StereoPictureAsset> (asset);
                int64_t const entry_point = (*_reel)->main_picture()->entry_point ();
                if (mono) {
-                       video (shared_ptr<ImageProxy> (new J2KImageProxy (mono->get_frame (entry_point + frame), asset->size())), frame);
+                       video (shared_ptr<ImageProxy> (new J2KImageProxy (mono->get_frame (entry_point + frame), asset->size())), offset + frame);
                } else {
                        video (
                                shared_ptr<ImageProxy> (new J2KImageProxy (stereo->get_frame (entry_point + frame), asset->size(), dcp::EYE_LEFT)),
-                               frame
+                               offset + frame
                                );
 
                        video (
                                shared_ptr<ImageProxy> (new J2KImageProxy (stereo->get_frame (entry_point + frame), asset->size(), dcp::EYE_RIGHT)),
-                               frame
+                               offset + frame
                                );
                }
        }
@@ -103,12 +113,12 @@ DCPDecoder::pass (PassReason reason)
                        }
                }
 
-               audio (_dcp_content->audio_stream(), data, _next);
+               audio (_dcp_content->audio_stream(), data, ContentTime::from_frames (offset, vfr) + _next);
        }
 
        if ((*_reel)->main_subtitle ()) {
                int64_t const entry_point = (*_reel)->main_subtitle()->entry_point ();
-               list<dcp::SubtitleString> subs = (*_reel)->main_subtitle()->subtitle_asset()->subtitles_during (
+               list<dcp::SubtitleString> subs = (*_reel)->main_subtitle()->asset()->subtitles_during (
                        dcp::Time (entry_point + frame, vfr, vfr),
                        dcp::Time (entry_point + frame + 1, vfr, vfr),
                        true
@@ -118,8 +128,8 @@ DCPDecoder::pass (PassReason reason)
                        /* XXX: assuming that all `subs' are at the same time; maybe this is ok */
                        text_subtitle (
                                ContentTimePeriod (
-                                       ContentTime::from_seconds (subs.front().in().as_seconds ()),
-                                       ContentTime::from_seconds (subs.front().out().as_seconds ())
+                                       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 ())
                                        ),
                                subs
                                );
@@ -131,6 +141,7 @@ DCPDecoder::pass (PassReason reason)
        if ((*_reel)->main_picture ()) {
                if (_next.frames_round (vfr) >= (*_reel)->main_picture()->duration()) {
                        ++_reel;
+                       _next = ContentTime ();
                }
        }
 
@@ -145,8 +156,8 @@ DCPDecoder::seek (ContentTime t, bool accurate)
        SubtitleDecoder::seek (t, accurate);
 
        _reel = _reels.begin ();
-       while (_reel != _reels.end() && t >= ContentTime::from_frames ((*_reel)->main_picture()->duration(), _dcp_content->video_frame_rate ())) {
-               t -= ContentTime::from_frames ((*_reel)->main_picture()->duration(), _dcp_content->video_frame_rate ());
+       while (_reel != _reels.end() && t >= ContentTime::from_frames ((*_reel)->main_picture()->duration(), _dcp_content->video->video_frame_rate ())) {
+               t -= ContentTime::from_frames ((*_reel)->main_picture()->duration(), _dcp_content->video->video_frame_rate ());
                ++_reel;
        }
 
@@ -166,7 +177,7 @@ DCPDecoder::text_subtitles_during (ContentTimePeriod period, bool starting) cons
        /* XXX: inefficient */
 
        list<ContentTimePeriod> ctp;
-       double const vfr = _dcp_content->video_frame_rate ();
+       double const vfr = _dcp_content->video->video_frame_rate ();
 
        BOOST_FOREACH (shared_ptr<dcp::Reel> r, _reels) {
                if (!r->main_subtitle ()) {
@@ -175,7 +186,7 @@ DCPDecoder::text_subtitles_during (ContentTimePeriod period, bool starting) cons
 
                int64_t const entry_point = r->main_subtitle()->entry_point ();
 
-               list<dcp::SubtitleString> subs = r->main_subtitle()->subtitle_asset()->subtitles_during (
+               list<dcp::SubtitleString> subs = r->main_subtitle()->asset()->subtitles_during (
                        dcp::Time (period.from.seconds(), 1000) - dcp::Time (entry_point, vfr, vfr),
                        dcp::Time (period.to.seconds(), 1000) - dcp::Time (entry_point, vfr, vfr),
                        starting