X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdcp_decoder.cc;h=0b99e8dd08f36f42d60da9e6559241db00b32411;hb=7b86ff6b62138b3917cc0b23e270769f536abd6b;hp=35fe375e9b97c925c02d25c9d240e152b1712b53;hpb=282caacdd0f9283ee8c52b2c67b4696e071eba03;p=dcpomatic.git diff --git a/src/lib/dcp_decoder.cc b/src/lib/dcp_decoder.cc index 35fe375e9..0b99e8dd0 100644 --- a/src/lib/dcp_decoder.cc +++ b/src/lib/dcp_decoder.cc @@ -28,7 +28,6 @@ #include "image.h" #include "config.h" #include -#include #include #include #include @@ -51,28 +50,29 @@ using boost::shared_ptr; using boost::dynamic_pointer_cast; DCPDecoder::DCPDecoder (shared_ptr c, shared_ptr log) - : _dcp_content (c) + : DCP (c) , _decode_referenced (false) { video.reset (new VideoDecoder (this, c, log)); audio.reset (new AudioDecoder (this, c->audio, log)); - subtitle.reset ( - new SubtitleDecoder ( - this, - c->subtitle, - bind (&DCPDecoder::image_subtitles_during, this, _1, _2), - bind (&DCPDecoder::text_subtitles_during, this, _1, _2) - ) - ); - - dcp::DCP dcp (c->directory ()); - dcp.read (false, 0, true); - if (c->kdm ()) { - dcp.add (dcp::DecryptedKDM (c->kdm().get (), Config::instance()->decryption_chain()->key().get ())); + subtitle.reset (new SubtitleDecoder (this, c->subtitle, log)); + + shared_ptr cpl; + BOOST_FOREACH (shared_ptr i, cpls ()) { + if (_dcp_content->cpl() && i->id() == _dcp_content->cpl().get()) { + cpl = i; + } + } + + if (!cpl) { + /* No CPL found; probably an old file that doesn't specify it; + just use the first one. + */ + cpl = cpls().front (); } - DCPOMATIC_ASSERT (dcp.cpls().size() == 1); - _reels = dcp.cpls().front()->reels (); + + _reels = cpl->reels (); _reel = _reels.begin (); _offset = 0; @@ -80,7 +80,7 @@ DCPDecoder::DCPDecoder (shared_ptr c, shared_ptr log) } bool -DCPDecoder::pass (PassReason reason, bool) +DCPDecoder::pass () { if (_reel == _reels.end () || !_dcp_content->can_be_played ()) { return true; @@ -91,25 +91,32 @@ DCPDecoder::pass (PassReason reason, bool) /* Frame within the (played part of the) reel that is coming up next */ int64_t const frame = _next.frames_round (vfr); - if ((_mono_reader || _stereo_reader) && reason != PASS_REASON_SUBTITLE && (_decode_referenced || !_dcp_content->reference_video())) { + if ((_mono_reader || _stereo_reader) && (_decode_referenced || !_dcp_content->reference_video())) { shared_ptr asset = (*_reel)->main_picture()->asset (); int64_t const entry_point = (*_reel)->main_picture()->entry_point (); if (_mono_reader) { - video->give (shared_ptr (new J2KImageProxy (_mono_reader->get_frame (entry_point + frame), asset->size())), _offset + frame); + video->emit ( + shared_ptr ( + new J2KImageProxy (_mono_reader->get_frame (entry_point + frame), asset->size(), AV_PIX_FMT_XYZ12LE) + ), + _offset + frame + ); } else { - video->give ( - shared_ptr (new J2KImageProxy (_stereo_reader->get_frame (entry_point + frame), asset->size(), dcp::EYE_LEFT)), + video->emit ( + shared_ptr ( + new J2KImageProxy (_stereo_reader->get_frame (entry_point + frame), asset->size(), dcp::EYE_LEFT, AV_PIX_FMT_XYZ12LE)), _offset + frame ); - video->give ( - shared_ptr (new J2KImageProxy (_stereo_reader->get_frame (entry_point + frame), asset->size(), dcp::EYE_RIGHT)), + video->emit ( + shared_ptr ( + new J2KImageProxy (_stereo_reader->get_frame (entry_point + frame), asset->size(), dcp::EYE_RIGHT, AV_PIX_FMT_XYZ12LE)), _offset + frame ); } } - if (_sound_reader && reason != PASS_REASON_SUBTITLE && (_decode_referenced || !_dcp_content->reference_audio())) { + if (_sound_reader && (_decode_referenced || !_dcp_content->reference_audio())) { int64_t const entry_point = (*_reel)->main_sound()->entry_point (); shared_ptr sf = _sound_reader->get_frame (entry_point + frame); uint8_t const * from = sf->data (); @@ -125,7 +132,7 @@ DCPDecoder::pass (PassReason reason, bool) } } - audio->give (_dcp_content->audio->stream(), data, ContentTime::from_frames (_offset, vfr) + _next); + audio->emit (_dcp_content->audio->stream(), data, ContentTime::from_frames (_offset, vfr) + _next); } if ((*_reel)->main_subtitle() && (_decode_referenced || !_dcp_content->reference_subtitle())) { @@ -138,7 +145,7 @@ DCPDecoder::pass (PassReason reason, bool) if (!subs.empty ()) { /* XXX: assuming that all `subs' are at the same time; maybe this is ok */ - subtitle->give_text ( + 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 ()) @@ -171,7 +178,7 @@ DCPDecoder::next_reel () void DCPDecoder::get_readers () { - if (_reel == _reels.end()) { + if (_reel == _reels.end() || !_dcp_content->can_be_played ()) { _mono_reader.reset (); _stereo_reader.reset (); _sound_reader.reset (); @@ -205,12 +212,12 @@ DCPDecoder::get_readers () void DCPDecoder::seek (ContentTime t, bool accurate) { - video->seek (t, accurate); - audio->seek (t, accurate); - subtitle->seek (t, accurate); + Decoder::seek (t, accurate); - _offset = 0; _reel = _reels.begin (); + _offset = 0; + get_readers (); + 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 (); @@ -219,47 +226,6 @@ DCPDecoder::seek (ContentTime t, bool accurate) _next = t; } - -list -DCPDecoder::image_subtitles_during (ContentTimePeriod, bool) const -{ - return list (); -} - -list -DCPDecoder::text_subtitles_during (ContentTimePeriod period, bool starting) const -{ - /* XXX: inefficient */ - - list ctp; - double const vfr = _dcp_content->active_video_frame_rate (); - - BOOST_FOREACH (shared_ptr r, _reels) { - if (!r->main_subtitle ()) { - continue; - } - - int64_t const entry_point = r->main_subtitle()->entry_point (); - - list 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 - ); - - BOOST_FOREACH (dcp::SubtitleString const & s, subs) { - ctp.push_back ( - ContentTimePeriod ( - ContentTime::from_seconds (s.in().as_seconds ()), - ContentTime::from_seconds (s.out().as_seconds ()) - ) - ); - } - } - - return ctp; -} - void DCPDecoder::set_decode_referenced () {