X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdcp_decoder.cc;h=4b189189e0b61fc395e83658968a1b34cf44947b;hb=7c73ec405fdb55bd78d82d764999b5af6d81e973;hp=a67b244f75392b4803a7d1638372c80e216f1070;hpb=254b3044d72de6b033d7c584f5abd2b9aa70aad5;p=dcpomatic.git diff --git a/src/lib/dcp_decoder.cc b/src/lib/dcp_decoder.cc index a67b244f7..4b189189e 100644 --- a/src/lib/dcp_decoder.cc +++ b/src/lib/dcp_decoder.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2014-2018 Carl Hetherington + Copyright (C) 2014-2019 Carl Hetherington This file is part of DCP-o-matic. @@ -28,6 +28,7 @@ #include "ffmpeg_image_proxy.h" #include "image.h" #include "config.h" +#include "digester.h" #include #include #include @@ -44,6 +45,7 @@ #include #include #include +#include #include #include @@ -51,49 +53,69 @@ using std::list; using std::cout; +using std::string; using boost::shared_ptr; using boost::dynamic_pointer_cast; using boost::optional; +using namespace dcpomatic; -DCPDecoder::DCPDecoder (shared_ptr c, bool fast) - : DCP (c) +DCPDecoder::DCPDecoder (shared_ptr film, shared_ptr c, bool fast, bool tolerant, shared_ptr old) + : DCP (c, tolerant) + , Decoder (film) , _decode_referenced (false) { - if (c->video) { - video.reset (new VideoDecoder (this, c)); - } - if (c->audio) { - audio.reset (new AudioDecoder (this, c->audio, fast)); - } - BOOST_FOREACH (shared_ptr i, c->text) { - /* XXX: this time here should be the time of the first subtitle, not 0 */ - text.push_back (shared_ptr (new TextDecoder (this, i, ContentTime()))); + if (c->can_be_played()) { + if (c->video) { + video.reset (new VideoDecoder (this, c)); + } + if (c->audio) { + audio.reset (new AudioDecoder (this, c->audio, fast)); + } + BOOST_FOREACH (shared_ptr i, c->text) { + /* XXX: this time here should be the time of the first subtitle, not 0 */ + text.push_back (shared_ptr (new TextDecoder (this, i, ContentTime()))); + } } - list > cpl_list = cpls (); + /* We try to avoid re-scanning the DCP's files every time we make a new DCPDecoder; we do this + by re-using the _reels list. Before we do this we need to check that nothing too serious + has changed in the DCPContent. - if (cpl_list.empty()) { - throw DCPError (_("No CPLs found in DCP.")); - } + We do this by storing a digest of the important bits of the DCPContent and then checking that's + the same before we re-use _reels. + */ + + _lazy_digest = calculate_lazy_digest (c); - shared_ptr cpl; - BOOST_FOREACH (shared_ptr i, cpl_list) { - if (_dcp_content->cpl() && i->id() == _dcp_content->cpl().get()) { - cpl = i; + if (old && old->lazy_digest() == _lazy_digest) { + _reels = old->_reels; + } else { + + list > cpl_list = cpls (); + + if (cpl_list.empty()) { + throw DCPError (_("No CPLs found in DCP.")); + } + + shared_ptr cpl; + BOOST_FOREACH (shared_ptr i, cpl_list) { + 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 (); + if (!cpl) { + /* No CPL found; probably an old file that doesn't specify it; + just use the first one. + */ + cpl = cpls().front (); + } + + _reels = cpl->reels (); } set_decode_referenced (false); - _reels = cpl->reels (); - _reel = _reels.begin (); _offset = 0; get_readers (); @@ -101,13 +123,13 @@ DCPDecoder::DCPDecoder (shared_ptr c, bool fast) bool -DCPDecoder::pass (shared_ptr film) +DCPDecoder::pass () { if (_reel == _reels.end () || !_dcp_content->can_be_played ()) { return true; } - double const vfr = _dcp_content->active_video_frame_rate (film); + double const vfr = _dcp_content->active_video_frame_rate (film()); /* Frame within the (played part of the) reel that is coming up next */ int64_t const frame = _next.frames_round (vfr); @@ -118,13 +140,13 @@ DCPDecoder::pass (shared_ptr film) /* We must emit texts first as when we emit the video for this frame it will expect already to have the texts. */ - pass_texts (film, _next, picture_asset->size()); + pass_texts (_next, picture_asset->size()); if ((_mono_reader || _stereo_reader) && (_decode_referenced || !_dcp_content->reference_video())) { - int64_t const entry_point = (*_reel)->main_picture()->entry_point (); + int64_t const entry_point = (*_reel)->main_picture()->entry_point().get_value_or(0); if (_mono_reader) { video->emit ( - film, + film(), shared_ptr ( new J2KImageProxy ( _mono_reader->get_frame (entry_point + frame), @@ -137,7 +159,7 @@ DCPDecoder::pass (shared_ptr film) ); } else { video->emit ( - film, + film(), shared_ptr ( new J2KImageProxy ( _stereo_reader->get_frame (entry_point + frame), @@ -151,7 +173,7 @@ DCPDecoder::pass (shared_ptr film) ); video->emit ( - film, + film(), shared_ptr ( new J2KImageProxy ( _stereo_reader->get_frame (entry_point + frame), @@ -167,7 +189,7 @@ DCPDecoder::pass (shared_ptr film) } if (_sound_reader && (_decode_referenced || !_dcp_content->reference_audio())) { - int64_t const entry_point = (*_reel)->main_sound()->entry_point (); + int64_t const entry_point = (*_reel)->main_sound()->entry_point().get_value_or(0); shared_ptr sf = _sound_reader->get_frame (entry_point + frame); uint8_t const * from = sf->data (); @@ -182,7 +204,7 @@ DCPDecoder::pass (shared_ptr film) } } - audio->emit (film, _dcp_content->audio->stream(), data, ContentTime::from_frames (_offset, vfr) + _next); + audio->emit (film(), _dcp_content->audio->stream(), data, ContentTime::from_frames (_offset, vfr) + _next); } _next += ContentTime::from_frames (1, vfr); @@ -198,17 +220,16 @@ DCPDecoder::pass (shared_ptr film) } void -DCPDecoder::pass_texts (shared_ptr film, ContentTime next, dcp::Size size) +DCPDecoder::pass_texts (ContentTime next, dcp::Size size) { list >::const_iterator decoder = text.begin (); if ((*_reel)->main_subtitle()) { DCPOMATIC_ASSERT (decoder != text.end ()); pass_texts ( - film, next, (*_reel)->main_subtitle()->asset(), _dcp_content->reference_text(TEXT_OPEN_SUBTITLE), - (*_reel)->main_subtitle()->entry_point(), + (*_reel)->main_subtitle()->entry_point().get_value_or(0), *decoder, size ); @@ -217,7 +238,7 @@ DCPDecoder::pass_texts (shared_ptr film, ContentTime next, dcp::Size BOOST_FOREACH (shared_ptr i, (*_reel)->closed_captions()) { DCPOMATIC_ASSERT (decoder != text.end ()); pass_texts ( - film, next, i->asset(), _dcp_content->reference_text(TEXT_CLOSED_CAPTION), i->entry_point(), *decoder, size + next, i->asset(), _dcp_content->reference_text(TEXT_CLOSED_CAPTION), i->entry_point().get_value_or(0), *decoder, size ); ++decoder; } @@ -225,10 +246,10 @@ DCPDecoder::pass_texts (shared_ptr film, ContentTime next, dcp::Size void DCPDecoder::pass_texts ( - shared_ptr film, ContentTime next, shared_ptr asset, bool reference, int64_t entry_point, shared_ptr decoder, dcp::Size size + ContentTime next, shared_ptr asset, bool reference, int64_t entry_point, shared_ptr decoder, dcp::Size size ) { - double const vfr = _dcp_content->active_video_frame_rate (film); + double const vfr = _dcp_content->active_video_frame_rate (film()); /* Frame within the (played part of the) reel that is coming up next */ int64_t const frame = next.frames_round (vfr); @@ -259,45 +280,20 @@ DCPDecoder::pass_texts ( strings.push_back (*is); } + /* XXX: perhaps these image subs should also be collected together like the string ones are; + this would need to be done both here and in DCPSubtitleDecoder. + */ + shared_ptr ii = dynamic_pointer_cast (i); if (ii) { - FFmpegImageProxy proxy (ii->png_image()); - shared_ptr image = proxy.image().first; - /* set up rect with height and width */ - dcpomatic::Rect rect(0, 0, image->size().width / double(size.width), image->size().height / double(size.height)); - - /* add in position */ - - switch (ii->h_align()) { - case dcp::HALIGN_LEFT: - rect.x += ii->h_position(); - break; - case dcp::HALIGN_CENTER: - rect.x += 0.5 + ii->h_position() - rect.width / 2; - break; - case dcp::HALIGN_RIGHT: - rect.x += 1 - ii->h_position() - rect.width; - break; - } - - switch (ii->v_align()) { - case dcp::VALIGN_TOP: - rect.y += ii->v_position(); - break; - case dcp::VALIGN_CENTER: - rect.y += 0.5 + ii->v_position() - rect.height / 2; - break; - case dcp::VALIGN_BOTTOM: - rect.y += 1 - ii->v_position() - rect.height; - break; - } - - decoder->emit_bitmap ( + emit_subtitle_image ( 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 ()) ), - image, rect + *ii, + size, + decoder ); } } @@ -319,7 +315,7 @@ DCPDecoder::pass_texts ( void DCPDecoder::next_reel () { - _offset += (*_reel)->main_picture()->duration(); + _offset += (*_reel)->main_picture()->actual_duration(); ++_reel; get_readers (); } @@ -359,13 +355,13 @@ DCPDecoder::get_readers () } void -DCPDecoder::seek (shared_ptr film, ContentTime t, bool accurate) +DCPDecoder::seek (ContentTime t, bool accurate) { if (!_dcp_content->can_be_played ()) { return; } - Decoder::seek (film, t, accurate); + Decoder::seek (t, accurate); _reel = _reels.begin (); _offset = 0; @@ -382,8 +378,12 @@ DCPDecoder::seek (shared_ptr film, ContentTime t, bool accurate) /* Seek to pre-roll position */ - while (_reel != _reels.end() && pre >= ContentTime::from_frames ((*_reel)->main_picture()->duration(), _dcp_content->active_video_frame_rate(film))) { - ContentTime rd = ContentTime::from_frames ((*_reel)->main_picture()->duration(), _dcp_content->active_video_frame_rate(film)); + while ( + _reel != _reels.end() && + pre >= ContentTime::from_frames ((*_reel)->main_picture()->actual_duration(), _dcp_content->active_video_frame_rate(film())) + ) { + + ContentTime rd = ContentTime::from_frames ((*_reel)->main_picture()->actual_duration(), _dcp_content->active_video_frame_rate(film())); pre -= rd; t -= rd; next_reel (); @@ -391,16 +391,20 @@ DCPDecoder::seek (shared_ptr film, ContentTime t, bool accurate) /* Pass texts in the pre-roll */ - double const vfr = _dcp_content->active_video_frame_rate (film); + double const vfr = _dcp_content->active_video_frame_rate (film()); for (int i = 0; i < pre_roll_seconds * vfr; ++i) { - pass_texts (film, pre, (*_reel)->main_picture()->asset()->size()); + pass_texts (pre, (*_reel)->main_picture()->asset()->size()); 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(film))) { - t -= ContentTime::from_frames ((*_reel)->main_picture()->duration(), _dcp_content->active_video_frame_rate(film)); + while ( + _reel != _reels.end() && + t >= ContentTime::from_frames ((*_reel)->main_picture()->actual_duration(), _dcp_content->active_video_frame_rate(film())) + ) { + + t -= ContentTime::from_frames ((*_reel)->main_picture()->actual_duration(), _dcp_content->active_video_frame_rate(film())); next_reel (); } @@ -425,3 +429,18 @@ DCPDecoder::set_forced_reduction (optional reduction) { _forced_reduction = reduction; } + +string +DCPDecoder::calculate_lazy_digest (shared_ptr c) const +{ + Digester d; + BOOST_FOREACH (boost::filesystem::path i, c->paths()) { + d.add (i.string()); + } + d.add (static_cast(_dcp_content->kdm())); + d.add (static_cast(c->cpl())); + if (c->cpl()) { + d.add (c->cpl().get()); + } + return d.get (); +}