X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fplayer.cc;h=a7cd0fd94ce93bf402b2ac152d4f9842c09f694e;hp=ce33d254bf2a68d4e5a78eabb200faded287cebb;hb=9cb73fbc0fa4643612f01665bc6d9fc430656f32;hpb=2f63654d5e452f2ab9ec90cd3449da4b113a3e94 diff --git a/src/lib/player.cc b/src/lib/player.cc index ce33d254b..a7cd0fd94 100644 --- a/src/lib/player.cc +++ b/src/lib/player.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2017 Carl Hetherington + Copyright (C) 2013-2018 Carl Hetherington This file is part of DCP-o-matic. @@ -28,7 +28,7 @@ #include "raw_image_proxy.h" #include "ratio.h" #include "log.h" -#include "render_subtitles.h" +#include "render_text.h" #include "config.h" #include "content_video.h" #include "player_video.h" @@ -40,14 +40,14 @@ #include "decoder.h" #include "video_decoder.h" #include "audio_decoder.h" -#include "subtitle_content.h" -#include "subtitle_decoder.h" +#include "text_content.h" +#include "text_decoder.h" #include "ffmpeg_content.h" #include "audio_content.h" -#include "content_subtitle.h" #include "dcp_decoder.h" #include "image_decoder.h" #include "compose.hpp" +#include "shuffler.h" #include #include #include @@ -77,6 +77,12 @@ using boost::dynamic_pointer_cast; using boost::optional; using boost::scoped_ptr; +int const PlayerProperty::VIDEO_CONTAINER_SIZE = 700; +int const PlayerProperty::PLAYLIST = 701; +int const PlayerProperty::FILM_CONTAINER = 702; +int const PlayerProperty::FILM_VIDEO_FRAME_RATE = 703; +int const PlayerProperty::DCP_DECODE_REDUCTION = 704; + Player::Player (shared_ptr film, shared_ptr playlist) : _film (film) , _playlist (playlist) @@ -87,6 +93,7 @@ Player::Player (shared_ptr film, shared_ptr playlist , _fast (false) , _play_referenced (false) , _audio_merger (_film->audio_frame_rate()) + , _shuffler (0) { _film_changed_connection = _film->Changed.connect (bind (&Player::film_changed, this, _1)); _playlist_changed_connection = _playlist->Changed.connect (bind (&Player::playlist_changed, this)); @@ -98,18 +105,27 @@ Player::Player (shared_ptr film, shared_ptr playlist seek (DCPTime (), true); } +Player::~Player () +{ + delete _shuffler; +} + void Player::setup_pieces () { _pieces.clear (); + delete _shuffler; + _shuffler = new Shuffler(); + _shuffler->Video.connect(bind(&Player::video, this, _1, _2)); + BOOST_FOREACH (shared_ptr i, _playlist->content ()) { if (!i->paths_valid ()) { continue; } - shared_ptr decoder = decoder_factory (i, _film->log()); + shared_ptr decoder = decoder_factory (i, _film->log(), _fast); FrameRateChange frc (i->active_video_frame_rate(), _film->video_frame_rate()); if (!decoder) { @@ -118,23 +134,31 @@ Player::setup_pieces () } if (decoder->video && _ignore_video) { - decoder->video->set_ignore (); + decoder->video->set_ignore (true); } if (decoder->subtitle && _ignore_subtitle) { - decoder->subtitle->set_ignore (); + decoder->subtitle->set_ignore (true); } shared_ptr dcp = dynamic_pointer_cast (decoder); - if (dcp && _play_referenced) { - dcp->set_decode_referenced (); + if (dcp) { + dcp->set_decode_referenced (_play_referenced); + if (_play_referenced) { + dcp->set_forced_reduction (_dcp_decode_reduction); + } } shared_ptr piece (new Piece (i, decoder, frc)); _pieces.push_back (piece); if (decoder->video) { - decoder->video->Data.connect (bind (&Player::video, this, weak_ptr (piece), _1)); + if (i->video->frame_type() == VIDEO_FRAME_TYPE_3D_LEFT || i->video->frame_type() == VIDEO_FRAME_TYPE_3D_RIGHT) { + /* We need a Shuffler to cope with 3D L/R video data arriving out of sequence */ + decoder->video->Data.connect (bind (&Shuffler::video, _shuffler, weak_ptr(piece), _1)); + } else { + decoder->video->Data.connect (bind (&Player::video, this, weak_ptr(piece), _1)); + } } if (decoder->audio) { @@ -142,12 +166,13 @@ Player::setup_pieces () } if (decoder->subtitle) { - decoder->subtitle->ImageStart.connect (bind (&Player::image_subtitle_start, this, weak_ptr (piece), _1)); - decoder->subtitle->TextStart.connect (bind (&Player::text_subtitle_start, this, weak_ptr (piece), _1)); - decoder->subtitle->Stop.connect (bind (&Player::subtitle_stop, this, weak_ptr (piece), _1)); + decoder->subtitle->BitmapStart.connect (bind (&Player::bitmap_text_start, this, weak_ptr (piece), _1)); + decoder->subtitle->PlainStart.connect (bind (&Player::plain_text_start, this, weak_ptr (piece), _1)); + decoder->subtitle->Stop.connect (bind (&Player::subtitle_stop, this, weak_ptr (piece), _1, _2)); } } + _stream_states.clear (); BOOST_FOREACH (shared_ptr i, _pieces) { if (i->content->audio) { BOOST_FOREACH (AudioStreamPtr j, i->content->audio->streams()) { @@ -156,7 +181,11 @@ Player::setup_pieces () } } + _black = Empty (_film->content(), _film->length(), bind(&Content::video, _1)); + _silent = Empty (_film->content(), _film->length(), bind(&Content::audio, _1)); + _last_video_time = DCPTime (); + _last_video_eyes = EYES_BOTH; _last_audio_time = DCPTime (); _have_valid_pieces = true; } @@ -176,38 +205,39 @@ Player::playlist_content_changed (weak_ptr w, int property, bool freque property == ContentProperty::TRIM_END || property == ContentProperty::PATH || property == VideoContentProperty::FRAME_TYPE || + property == VideoContentProperty::COLOUR_CONVERSION || + property == AudioContentProperty::STREAMS || property == DCPContentProperty::NEEDS_ASSETS || property == DCPContentProperty::NEEDS_KDM || - property == SubtitleContentProperty::COLOUR || - property == SubtitleContentProperty::OUTLINE || - property == SubtitleContentProperty::SHADOW || - property == SubtitleContentProperty::EFFECT_COLOUR || + property == TextContentProperty::COLOUR || + property == TextContentProperty::EFFECT || + property == TextContentProperty::EFFECT_COLOUR || property == FFmpegContentProperty::SUBTITLE_STREAM || - property == VideoContentProperty::COLOUR_CONVERSION + property == FFmpegContentProperty::FILTERS ) { _have_valid_pieces = false; - Changed (frequent); + Changed (property, frequent); } else if ( - property == SubtitleContentProperty::LINE_SPACING || - property == SubtitleContentProperty::OUTLINE_WIDTH || - property == SubtitleContentProperty::Y_SCALE || - property == SubtitleContentProperty::FADE_IN || - property == SubtitleContentProperty::FADE_OUT || + property == TextContentProperty::LINE_SPACING || + property == TextContentProperty::OUTLINE_WIDTH || + property == TextContentProperty::Y_SCALE || + property == TextContentProperty::FADE_IN || + property == TextContentProperty::FADE_OUT || property == ContentProperty::VIDEO_FRAME_RATE || - property == SubtitleContentProperty::USE || - property == SubtitleContentProperty::X_OFFSET || - property == SubtitleContentProperty::Y_OFFSET || - property == SubtitleContentProperty::X_SCALE || - property == SubtitleContentProperty::FONTS || + property == TextContentProperty::USE || + property == TextContentProperty::X_OFFSET || + property == TextContentProperty::Y_OFFSET || + property == TextContentProperty::X_SCALE || + property == TextContentProperty::FONTS || property == VideoContentProperty::CROP || property == VideoContentProperty::SCALE || property == VideoContentProperty::FADE_IN || property == VideoContentProperty::FADE_OUT ) { - Changed (frequent); + Changed (property, frequent); } } @@ -223,14 +253,14 @@ Player::set_video_container_size (dcp::Size s) _black_image.reset (new Image (AV_PIX_FMT_RGB24, _video_container_size, true)); _black_image->make_black (); - Changed (false); + Changed (PlayerProperty::VIDEO_CONTAINER_SIZE, false); } void Player::playlist_changed () { _have_valid_pieces = false; - Changed (false); + Changed (PlayerProperty::PLAYLIST, false); } void @@ -242,26 +272,28 @@ Player::film_changed (Film::Property p) */ if (p == Film::CONTAINER) { - Changed (false); + Changed (PlayerProperty::FILM_CONTAINER, false); } else if (p == Film::VIDEO_FRAME_RATE) { /* Pieces contain a FrameRateChange which contains the DCP frame rate, so we need new pieces here. */ _have_valid_pieces = false; - Changed (false); + Changed (PlayerProperty::FILM_VIDEO_FRAME_RATE, false); } else if (p == Film::AUDIO_PROCESSOR) { if (_film->audio_processor ()) { _audio_processor = _film->audio_processor()->clone (_film->audio_frame_rate ()); } + } else if (p == Film::AUDIO_CHANNELS) { + _audio_merger.clear (); } } list -Player::transform_image_subtitles (list subs) const +Player::transform_bitmap_texts (list subs) const { list all; - for (list::const_iterator i = subs.begin(); i != subs.end(); ++i) { + for (list::const_iterator i = subs.begin(); i != subs.end(); ++i) { if (!i->image) { continue; } @@ -269,18 +301,6 @@ Player::transform_image_subtitles (list subs) const /* We will scale the subtitle up to fit _video_container_size */ dcp::Size scaled_size (i->rectangle.width * _video_container_size.width, i->rectangle.height * _video_container_size.height); - /* Then we need a corrective translation, consisting of two parts: - * - * 1. that which is the result of the scaling of the subtitle by _video_container_size; this will be - * rect.x * _video_container_size.width and rect.y * _video_container_size.height. - * - * 2. that to shift the origin of the scale by subtitle_scale to the centre of the subtitle; this will be - * (width_before_subtitle_scale * (1 - subtitle_x_scale) / 2) and - * (height_before_subtitle_scale * (1 - subtitle_y_scale) / 2). - * - * Combining these two translations gives these expressions. - */ - all.push_back ( PositionImage ( i->image->scale ( @@ -302,7 +322,7 @@ Player::transform_image_subtitles (list subs) const } shared_ptr -Player::black_player_video_frame () const +Player::black_player_video_frame (Eyes eyes) const { return shared_ptr ( new PlayerVideo ( @@ -311,9 +331,11 @@ Player::black_player_video_frame () const optional (), _video_container_size, _video_container_size, - EYES_BOTH, + eyes, PART_WHOLE, - PresetColourConversion::all().front().conversion + PresetColourConversion::all().front().conversion, + boost::weak_ptr(), + boost::optional() ) ); } @@ -339,8 +361,8 @@ DCPTime Player::content_video_to_dcp (shared_ptr piece, Frame f) const { /* See comment in dcp_to_content_video */ - DCPTime const d = DCPTime::from_frames (f * piece->frc.factor(), piece->frc.dcp) - DCPTime (piece->content->trim_start (), piece->frc); - return max (DCPTime (), d + piece->content->position ()); + DCPTime const d = DCPTime::from_frames (f * piece->frc.factor(), piece->frc.dcp) - DCPTime(piece->content->trim_start(), piece->frc); + return d + piece->content->position(); } Frame @@ -419,6 +441,7 @@ Player::set_always_burn_subtitles (bool burn) _always_burn_subtitles = burn; } +/** Sets up the player to be faster, possibly at the expense of quality */ void Player::set_fast () { @@ -446,7 +469,7 @@ Player::get_reel_assets () scoped_ptr decoder; try { - decoder.reset (new DCPDecoder (j, _film->log())); + decoder.reset (new DCPDecoder (j, _film->log(), false)); } catch (...) { return a; } @@ -508,7 +531,7 @@ Player::pass () if (_playlist->length() == DCPTime()) { /* Special case of an empty Film; just give one black frame */ - emit_video (black_player_video_frame(), DCPTime()); + emit_video (black_player_video_frame(EYES_BOTH), DCPTime()); return true; } @@ -518,8 +541,15 @@ Player::pass () optional earliest_time; BOOST_FOREACH (shared_ptr i, _pieces) { - if (!i->done) { - DCPTime const t = content_time_to_dcp (i, i->decoder->position()); + if (i->done) { + continue; + } + + DCPTime const t = content_time_to_dcp (i, max(i->decoder->position(), i->content->trim_start())); + if (t > i->content->end()) { + i->done = true; + } else { + /* Given two choices at the same time, pick the one with a subtitle so we see it before the video. */ @@ -558,12 +588,20 @@ Player::pass () earliest_content->done = earliest_content->decoder->pass (); break; case BLACK: - emit_video (black_player_video_frame(), _black.position()); + emit_video (black_player_video_frame(EYES_BOTH), _black.position()); _black.set_position (_black.position() + one_video_frame()); break; case SILENT: { DCPTimePeriod period (_silent.period_at_position()); + if (_last_audio_time) { + /* Sometimes the thing that happened last finishes fractionally before + this silence. Bodge the start time of the silence to fix it. I'm + not sure if this is the right solution --- maybe the last thing should + be padded `forward' rather than this thing padding `back'. + */ + period.from = min(period.from, *_last_audio_time); + } if (period.duration() > one_video_frame()) { period.to = period.from + one_video_frame(); } @@ -578,29 +616,43 @@ Player::pass () /* Emit any audio that is ready */ + /* Work out the time before which the audio is definitely all here. This is the earliest last_push_end of one + of our streams, or the position of the _silent. + */ DCPTime pull_to = _film->length (); for (map::const_iterator i = _stream_states.begin(); i != _stream_states.end(); ++i) { if (!i->second.piece->done && i->second.last_push_end < pull_to) { pull_to = i->second.last_push_end; } } + if (!_silent.done() && _silent.position() < pull_to) { + pull_to = _silent.position(); + } list, DCPTime> > audio = _audio_merger.pull (pull_to); for (list, DCPTime> >::iterator i = audio.begin(); i != audio.end(); ++i) { if (_last_audio_time && i->second < *_last_audio_time) { - /* There has been an accurate seek and we have received some audio before the seek time; - discard it. - */ + /* This new data comes before the last we emitted (or the last seek); discard it */ pair, DCPTime> cut = discard_audio (i->first, i->second, *_last_audio_time); if (!cut.first) { continue; } *i = cut; + } else if (_last_audio_time && i->second > *_last_audio_time) { + /* There's a gap between this data and the last we emitted; fill with silence */ + fill_audio (DCPTimePeriod (*_last_audio_time, i->second)); } emit_audio (i->first, i->second); } + if (done) { + _shuffler->flush (); + for (list, DCPTime> >::const_iterator i = _delay.begin(); i != _delay.end(); ++i) { + do_emit_video(i->first, i->second); + } + } + return done; } @@ -609,15 +661,17 @@ Player::subtitles_for_frame (DCPTime time) const { list subtitles; - BOOST_FOREACH (PlayerSubtitles i, _active_subtitles.get_burnt (time, _always_burn_subtitles)) { + int const vfr = _film->video_frame_rate(); + + BOOST_FOREACH (PlayerCaption i, _active_text[TEXT_SUBTITLE].get_burnt (DCPTimePeriod(time, time + DCPTime::from_frames(1, vfr)), _always_burn_subtitles)) { /* Image subtitles */ - list c = transform_image_subtitles (i.image); + list c = transform_bitmap_texts (i.image); copy (c.begin(), c.end(), back_inserter (subtitles)); /* Text subtitles (rendered to an image) */ if (!i.text.empty ()) { - list s = render_subtitles (i.text, i.fonts, _video_container_size, time); + list s = render_text (i.text, i.fonts, _video_container_size, time, vfr); copy (s.begin(), s.end(), back_inserter (subtitles)); } } @@ -642,29 +696,51 @@ Player::video (weak_ptr wp, ContentVideo video) return; } - /* Time and period of the frame we will emit */ + /* Time of the first frame we will emit */ DCPTime const time = content_video_to_dcp (piece, video.frame); - DCPTimePeriod const period (time, time + one_video_frame()); - /* Discard if it's outside the content's period or if it's before the last accurate seek */ - if ( - time < piece->content->position() || - time >= piece->content->end() || - (_last_video_time && time < *_last_video_time)) { + /* Discard if it's before the content's period or the last accurate seek. We can't discard + if it's after the content's period here as in that case we still need to fill any gap between + `now' and the end of the content's period. + */ + if (time < piece->content->position() || (_last_video_time && time < *_last_video_time)) { return; } - /* Fill gaps that we discover now that we have some video which needs to be emitted */ + /* Fill gaps that we discover now that we have some video which needs to be emitted. + This is where we need to fill to. + */ + DCPTime fill_to = min (time, piece->content->end()); if (_last_video_time) { - /* XXX: this may not work for 3D */ DCPTime fill_from = max (*_last_video_time, piece->content->position()); - for (DCPTime j = fill_from; j < time; j += one_video_frame()) { - LastVideoMap::const_iterator k = _last_video.find (wp); - if (k != _last_video.end ()) { - emit_video (k->second, j); - } else { - emit_video (black_player_video_frame(), j); + LastVideoMap::const_iterator last = _last_video.find (wp); + if (_film->three_d()) { + DCPTime j = fill_from; + Eyes eyes = _last_video_eyes.get_value_or(EYES_LEFT); + if (eyes == EYES_BOTH) { + eyes = EYES_LEFT; + } + while (j < fill_to || eyes != video.eyes) { + if (last != _last_video.end()) { + shared_ptr copy = last->second->shallow_copy(); + copy->set_eyes (eyes); + emit_video (copy, j); + } else { + emit_video (black_player_video_frame(eyes), j); + } + if (eyes == EYES_RIGHT) { + j += one_video_frame(); + } + eyes = increment_eyes (eyes); + } + } else { + for (DCPTime j = fill_from; j < fill_to; j += one_video_frame()) { + if (last != _last_video.end()) { + emit_video (last->second, j); + } else { + emit_video (black_player_video_frame(EYES_BOTH), j); + } } } } @@ -680,11 +756,19 @@ Player::video (weak_ptr wp, ContentVideo video) _video_container_size, video.eyes, video.part, - piece->content->video->colour_conversion () + piece->content->video->colour_conversion(), + piece->content, + video.frame ) ); - emit_video (_last_video[wp], time); + DCPTime t = time; + for (int i = 0; i < frc.repeat; ++i) { + if (t < piece->content->end()) { + emit_video (_last_video[wp], t); + } + t += one_video_frame (); + } } void @@ -755,7 +839,7 @@ Player::audio (weak_ptr wp, AudioStreamPtr stream, ContentAudio content_a } void -Player::image_subtitle_start (weak_ptr wp, ContentImageSubtitle subtitle) +Player::bitmap_text_start (weak_ptr wp, ContentBitmapCaption subtitle) { shared_ptr piece = wp.lock (); if (!piece) { @@ -766,32 +850,36 @@ Player::image_subtitle_start (weak_ptr wp, ContentImageSubtitle subtitle) subtitle.sub.rectangle.x += piece->content->subtitle->x_offset (); subtitle.sub.rectangle.y += piece->content->subtitle->y_offset (); + /* Apply a corrective translation to keep the subtitle centred after the scale that is coming up */ + subtitle.sub.rectangle.x -= subtitle.sub.rectangle.width * ((piece->content->subtitle->x_scale() - 1) / 2); + subtitle.sub.rectangle.y -= subtitle.sub.rectangle.height * ((piece->content->subtitle->y_scale() - 1) / 2); + /* Apply content's subtitle scale */ subtitle.sub.rectangle.width *= piece->content->subtitle->x_scale (); subtitle.sub.rectangle.height *= piece->content->subtitle->y_scale (); - /* Apply a corrective translation to keep the subtitle centred after that scale */ - subtitle.sub.rectangle.x -= subtitle.sub.rectangle.width * (piece->content->subtitle->x_scale() - 1); - subtitle.sub.rectangle.y -= subtitle.sub.rectangle.height * (piece->content->subtitle->y_scale() - 1); - - PlayerSubtitles ps; + PlayerCaption ps; ps.image.push_back (subtitle.sub); DCPTime from (content_time_to_dcp (piece, subtitle.from())); - _active_subtitles.add_from (wp, ps, from); + _active_text[subtitle.type()].add_from (wp, ps, from); } void -Player::text_subtitle_start (weak_ptr wp, ContentTextSubtitle subtitle) +Player::plain_text_start (weak_ptr wp, ContentTextCaption subtitle) { shared_ptr piece = wp.lock (); if (!piece) { return; } - PlayerSubtitles ps; + PlayerCaption ps; DCPTime const from (content_time_to_dcp (piece, subtitle.from())); + if (from > piece->content->end()) { + return; + } + BOOST_FOREACH (dcp::SubtitleString s, subtitle.subs) { s.set_h_position (s.h_position() + piece->content->subtitle->x_offset ()); s.set_v_position (s.v_position() + piece->content->subtitle->y_offset ()); @@ -813,17 +901,17 @@ Player::text_subtitle_start (weak_ptr wp, ContentTextSubtitle subtitle) } s.set_in (dcp::Time(from.seconds(), 1000)); - ps.text.push_back (SubtitleString (s, piece->content->subtitle->outline_width())); + ps.text.push_back (TextCaption (s, piece->content->subtitle->outline_width())); ps.add_fonts (piece->content->subtitle->fonts ()); } - _active_subtitles.add_from (wp, ps, from); + _active_text[subtitle.type()].add_from (wp, ps, from); } void -Player::subtitle_stop (weak_ptr wp, ContentTime to) +Player::subtitle_stop (weak_ptr wp, ContentTime to, TextType type) { - if (!_active_subtitles.have (wp)) { + if (!_active_text[type].have (wp)) { return; } @@ -834,27 +922,43 @@ Player::subtitle_stop (weak_ptr wp, ContentTime to) DCPTime const dcp_to = content_time_to_dcp (piece, to); - pair from = _active_subtitles.add_to (wp, dcp_to); + if (dcp_to > piece->content->end()) { + return; + } + + pair from = _active_text[type].add_to (wp, dcp_to); if (piece->content->subtitle->use() && !_always_burn_subtitles && !piece->content->subtitle->burn()) { - Subtitle (from.first, DCPTimePeriod (from.second, dcp_to)); + Text (from.first, type, DCPTimePeriod (from.second, dcp_to)); } } void Player::seek (DCPTime time, bool accurate) { + if (!_have_valid_pieces) { + setup_pieces (); + } + + if (_shuffler) { + _shuffler->clear (); + } + + _delay.clear (); + if (_audio_processor) { _audio_processor->flush (); } _audio_merger.clear (); - _active_subtitles.clear (); + for (int i = 0; i < TEXT_COUNT; ++i) { + _active_text[i].clear (); + } BOOST_FOREACH (shared_ptr i, _pieces) { if (time < i->content->position()) { - /* Before; seek to 0 */ - i->decoder->seek (ContentTime(), accurate); + /* Before; seek to the start of the content */ + i->decoder->seek (dcp_to_content_time (i, i->content->position()), accurate); i->done = false; } else if (i->content->position() <= time && time < i->content->end()) { /* During; seek to position */ @@ -868,9 +972,11 @@ Player::seek (DCPTime time, bool accurate) if (accurate) { _last_video_time = time; + _last_video_eyes = EYES_LEFT; _last_audio_time = time; } else { _last_video_time = optional(); + _last_video_eyes = optional(); _last_audio_time = optional(); } @@ -883,22 +989,52 @@ Player::seek (DCPTime time, bool accurate) void Player::emit_video (shared_ptr pv, DCPTime time) { + /* We need a delay to give a little wiggle room to ensure that relevent subtitles arrive at the + player before the video that requires them. + */ + _delay.push_back (make_pair (pv, time)); + + if (pv->eyes() == EYES_BOTH || pv->eyes() == EYES_RIGHT) { + _last_video_time = time + one_video_frame(); + } + _last_video_eyes = increment_eyes (pv->eyes()); + + if (_delay.size() < 3) { + return; + } + + pair, DCPTime> to_do = _delay.front(); + _delay.pop_front(); + do_emit_video (to_do.first, to_do.second); +} + +void +Player::do_emit_video (shared_ptr pv, DCPTime time) +{ + if (pv->eyes() == EYES_BOTH || pv->eyes() == EYES_RIGHT) { + for (int i = 0; i < TEXT_COUNT; ++i) { + _active_text[i].clear_before (time); + } + } + optional subtitles = subtitles_for_frame (time); if (subtitles) { pv->set_subtitle (subtitles.get ()); } Video (pv, time); - - if (pv->eyes() == EYES_BOTH || pv->eyes() == EYES_RIGHT) { - _last_video_time = time + one_video_frame(); - _active_subtitles.clear_before (time); - } } void Player::emit_audio (shared_ptr data, DCPTime time) { + /* Log if the assert below is about to fail */ + if (_last_audio_time && time != *_last_audio_time) { + _film->log()->log(String::compose("Out-of-sequence emit %1 vs %2", to_string(time), to_string(*_last_audio_time)), LogEntry::TYPE_WARNING); + } + + /* This audio must follow on from the previous */ + DCPOMATIC_ASSERT (!_last_audio_time || time == *_last_audio_time); Audio (data, time); _last_audio_time = time + DCPTime::from_frames (data->frames(), _film->audio_frame_rate()); } @@ -944,3 +1080,32 @@ Player::discard_audio (shared_ptr audio, DCPTime time, DCPTi cut->copy_from (audio.get(), remaining_frames, discard_frames, 0); return make_pair(cut, time + discard_time); } + +void +Player::set_dcp_decode_reduction (optional reduction) +{ + if (reduction == _dcp_decode_reduction) { + return; + } + + _dcp_decode_reduction = reduction; + _have_valid_pieces = false; + Changed (PlayerProperty::DCP_DECODE_REDUCTION, false); +} + +DCPTime +Player::content_time_to_dcp (shared_ptr content, ContentTime t) +{ + if (_have_valid_pieces) { + setup_pieces (); + } + + BOOST_FOREACH (shared_ptr i, _pieces) { + if (i->content == content) { + return content_time_to_dcp (i, t); + } + } + + DCPOMATIC_ASSERT (false); + return DCPTime (); +}