X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdcp_decoder.cc;h=5a72fb2281b30fda0d06d1cefc6b33b779b9792c;hb=c4403784febdbdd42e9c32e67fadb147f11fe566;hp=72db5369c81e9dd162457d5636bb0c3b420b44fa;hpb=72b11d5eb036651b6ff68edf3ed270e8fc52960f;p=dcpomatic.git diff --git a/src/lib/dcp_decoder.cc b/src/lib/dcp_decoder.cc index 72db5369c..5a72fb228 100644 --- a/src/lib/dcp_decoder.cc +++ b/src/lib/dcp_decoder.cc @@ -54,20 +54,24 @@ using std::cout; using boost::shared_ptr; using boost::dynamic_pointer_cast; using boost::optional; +using namespace dcpomatic; -DCPDecoder::DCPDecoder (shared_ptr c, shared_ptr log, bool fast) +DCPDecoder::DCPDecoder (shared_ptr film, shared_ptr c, bool fast) : DCP (c) + , Decoder (film) , _decode_referenced (false) { - if (c->video) { - video.reset (new VideoDecoder (this, c, log)); - } - if (c->audio) { - audio.reset (new AudioDecoder (this, c->audio, log, 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, log, 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 (); @@ -107,7 +111,7 @@ DCPDecoder::pass () return true; } - double const vfr = _dcp_content->active_video_frame_rate (); + 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); @@ -121,9 +125,10 @@ DCPDecoder::pass () 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(), shared_ptr ( new J2KImageProxy ( _mono_reader->get_frame (entry_point + frame), @@ -136,6 +141,7 @@ DCPDecoder::pass () ); } else { video->emit ( + film(), shared_ptr ( new J2KImageProxy ( _stereo_reader->get_frame (entry_point + frame), @@ -149,6 +155,7 @@ DCPDecoder::pass () ); video->emit ( + film(), shared_ptr ( new J2KImageProxy ( _stereo_reader->get_frame (entry_point + frame), @@ -164,7 +171,7 @@ DCPDecoder::pass () } 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 (); @@ -179,7 +186,7 @@ DCPDecoder::pass () } } - audio->emit (_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); @@ -201,23 +208,30 @@ DCPDecoder::pass_texts (ContentTime next, dcp::Size size) if ((*_reel)->main_subtitle()) { DCPOMATIC_ASSERT (decoder != text.end ()); pass_texts ( - next, (*_reel)->main_subtitle()->asset(), _dcp_content->reference_text(TEXT_OPEN_SUBTITLE), (*_reel)->main_subtitle()->entry_point(), *decoder, size + next, + (*_reel)->main_subtitle()->asset(), + _dcp_content->reference_text(TEXT_OPEN_SUBTITLE), + (*_reel)->main_subtitle()->entry_point().get_value_or(0), + *decoder, + size ); ++decoder; } BOOST_FOREACH (shared_ptr i, (*_reel)->closed_captions()) { DCPOMATIC_ASSERT (decoder != text.end ()); pass_texts ( - 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; } } void -DCPDecoder::pass_texts (ContentTime next, shared_ptr asset, bool reference, int64_t entry_point, shared_ptr decoder, dcp::Size size) +DCPDecoder::pass_texts ( + 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 (); + 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); @@ -228,69 +242,62 @@ DCPDecoder::pass_texts (ContentTime next, shared_ptr asset, true ); + list strings; + BOOST_FOREACH (shared_ptr i, subs) { shared_ptr is = dynamic_pointer_cast (i); if (is) { - list s; - s.push_back (*is); - decoder->emit_plain ( - 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 ()) - ), - s - ); + if (!strings.empty() && (strings.back().in() != is->in() || strings.back().out() != is->out())) { + dcp::SubtitleString b = strings.back(); + decoder->emit_plain ( + ContentTimePeriod ( + ContentTime::from_frames(_offset - entry_point, vfr) + ContentTime::from_seconds(b.in().as_seconds()), + ContentTime::from_frames(_offset - entry_point, vfr) + ContentTime::from_seconds(b.out().as_seconds()) + ), + strings + ); + strings.clear (); + } + + 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 ); } } + + if (!strings.empty()) { + dcp::SubtitleString b = strings.back(); + decoder->emit_plain ( + ContentTimePeriod ( + ContentTime::from_frames(_offset - entry_point, vfr) + ContentTime::from_seconds(b.in().as_seconds()), + ContentTime::from_frames(_offset - entry_point, vfr) + ContentTime::from_seconds(b.out().as_seconds()) + ), + strings + ); + strings.clear (); + } } } void DCPDecoder::next_reel () { - _offset += (*_reel)->main_picture()->duration(); + _offset += (*_reel)->main_picture()->actual_duration(); ++_reel; get_readers (); } @@ -353,8 +360,12 @@ DCPDecoder::seek (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 ())) { - ContentTime rd = ContentTime::from_frames ((*_reel)->main_picture()->duration(), _dcp_content->active_video_frame_rate ()); + 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 (); @@ -362,7 +373,7 @@ DCPDecoder::seek (ContentTime t, bool accurate) /* Pass texts in the pre-roll */ - double const vfr = _dcp_content->active_video_frame_rate (); + double const vfr = _dcp_content->active_video_frame_rate (film()); for (int i = 0; i < pre_roll_seconds * vfr; ++i) { pass_texts (pre, (*_reel)->main_picture()->asset()->size()); pre += ContentTime::from_frames (1, vfr); @@ -370,8 +381,12 @@ DCPDecoder::seek (ContentTime t, bool accurate) /* 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 ()); + 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 (); }