X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fplayer.cc;h=522b8304f533aa6674fd02fb1ccef6da3fb43bdb;hb=1aad2c33896ce6222f3c929c7af7fe4ff5fda0f2;hp=7f8b06458bd06876101e3dd6f9b51d26f4fc7bd6;hpb=fa4d2529d63bcfa7cf7c516b7227e20a1b6dec7e;p=dcpomatic.git diff --git a/src/lib/player.cc b/src/lib/player.cc index 7f8b06458..522b8304f 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. @@ -48,6 +48,7 @@ #include "dcp_decoder.h" #include "image_decoder.h" #include "compose.hpp" +#include "shuffler.h" #include #include #include @@ -82,11 +83,12 @@ Player::Player (shared_ptr film, shared_ptr playlist , _playlist (playlist) , _have_valid_pieces (false) , _ignore_video (false) - , _ignore_audio (false) + , _ignore_subtitle (false) , _always_burn_subtitles (false) , _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 +100,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) { @@ -121,20 +132,27 @@ Player::setup_pieces () decoder->video->set_ignore (); } - if (decoder->audio && _ignore_audio) { - decoder->audio->set_ignore (); + if (decoder->subtitle && _ignore_subtitle) { + decoder->subtitle->set_ignore (); } shared_ptr dcp = dynamic_pointer_cast (decoder); if (dcp && _play_referenced) { - dcp->set_decode_referenced (); + if (_play_referenced) { + dcp->set_decode_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) { + 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) { @@ -148,6 +166,7 @@ Player::setup_pieces () } } + _stream_states.clear (); BOOST_FOREACH (shared_ptr i, _pieces) { if (i->content->audio) { BOOST_FOREACH (AudioStreamPtr j, i->content->audio->streams()) { @@ -156,21 +175,11 @@ Player::setup_pieces () } } - if (!_play_referenced) { - BOOST_FOREACH (shared_ptr i, _pieces) { - shared_ptr dc = dynamic_pointer_cast (i->content); - if (dc) { - if (dc->reference_video()) { - _no_video.push_back (DCPTimePeriod (dc->position(), dc->end())); - } - if (dc->reference_audio()) { - _no_audio.push_back (DCPTimePeriod (dc->position(), dc->end())); - } - } - } - } + _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; } @@ -193,10 +202,10 @@ Player::playlist_content_changed (weak_ptr w, int property, bool freque property == DCPContentProperty::NEEDS_ASSETS || property == DCPContentProperty::NEEDS_KDM || property == SubtitleContentProperty::COLOUR || - property == SubtitleContentProperty::OUTLINE || - property == SubtitleContentProperty::SHADOW || + property == SubtitleContentProperty::EFFECT || property == SubtitleContentProperty::EFFECT_COLOUR || property == FFmpegContentProperty::SUBTITLE_STREAM || + property == FFmpegContentProperty::FILTERS || property == VideoContentProperty::COLOUR_CONVERSION ) { @@ -316,7 +325,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 ( @@ -325,7 +334,7 @@ Player::black_player_video_frame () const optional (), _video_container_size, _video_container_size, - EYES_BOTH, + eyes, PART_WHOLE, PresetColourConversion::all().front().conversion ) @@ -353,8 +362,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 @@ -370,8 +379,9 @@ DCPTime Player::resampled_audio_to_dcp (shared_ptr piece, Frame f) const { /* See comment in dcp_to_content_video */ - DCPTime const d = DCPTime::from_frames (f, _film->audio_frame_rate()) - DCPTime (piece->content->trim_start(), piece->frc); - return max (DCPTime (), d + piece->content->position ()); + return DCPTime::from_frames (f, _film->audio_frame_rate()) + - DCPTime (piece->content->trim_start(), piece->frc) + + piece->content->position(); } ContentTime @@ -416,6 +426,12 @@ Player::set_ignore_video () _ignore_video = true; } +void +Player::set_ignore_subtitle () +{ + _ignore_subtitle = true; +} + /** Set whether or not this player should always burn text subtitles into the image, * regardless of the content settings. * @param burn true to always burn subtitles, false to obey content settings. @@ -426,6 +442,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 () { @@ -453,7 +470,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; } @@ -513,104 +530,119 @@ Player::pass () setup_pieces (); } - shared_ptr earliest; - DCPTime earliest_content; + if (_playlist->length() == DCPTime()) { + /* Special case of an empty Film; just give one black frame */ + emit_video (black_player_video_frame(EYES_BOTH), DCPTime()); + return true; + } + + /* Find the decoder or empty which is farthest behind where we are and make it emit some data */ + + shared_ptr earliest_content; + optional earliest_time; BOOST_FOREACH (shared_ptr i, _pieces) { - if (!i->done) { - DCPTime const t = content_time_to_dcp (i, i->decoder->position()); - if (!earliest || t < earliest_content) { - earliest_content = t; - earliest = i; + if (i->done) { + continue; + } + + DCPTime const t = content_time_to_dcp (i, i->decoder->position()); + 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. + */ + if (!earliest_time || t < *earliest_time || (t == *earliest_time && i->decoder->subtitle)) { + earliest_time = t; + earliest_content = i; } } } - /* Fill towards the next thing that might happen (or the end of the playlist). This is to fill gaps between content, - NOT to fill gaps within content (the latter is done in ::video()) - */ - DCPTime fill_towards = earliest ? earliest_content : _playlist->length().ceil(_film->video_frame_rate()); + bool done = false; - /* Work out where to fill video from */ - optional video_fill_from; - if (_last_video_time) { - /* Fill from the last video or seek time */ - video_fill_from = _last_video_time; - } + enum { + NONE, + CONTENT, + BLACK, + SILENT + } which = NONE; - bool filled = false; - /* Fill some black if we would emit before the earliest piece of content. This is so we act like a phantom - Piece which emits black in spaces (we only emit if we are the earliest thing) - */ - if (video_fill_from && (!earliest || *video_fill_from < earliest_content) && ((fill_towards - *video_fill_from)) >= one_video_frame()) { - list p = subtract(DCPTimePeriod(*video_fill_from, *video_fill_from + one_video_frame()), _no_video); - if (!p.empty ()) { - emit_video (black_player_video_frame(), p.front().from); - filled = true; - } - } else if (_playlist->length() == DCPTime()) { - /* Special case of an empty Film; just give one black frame */ - emit_video (black_player_video_frame(), DCPTime()); - filled = true; + if (earliest_content) { + which = CONTENT; } - optional audio_fill_from; - if (_last_audio_time) { - /* Fill from the last audio or seek time */ - audio_fill_from = _last_audio_time; + if (!_black.done() && (!earliest_time || _black.position() < *earliest_time)) { + earliest_time = _black.position (); + which = BLACK; } - DCPTime audio_fill_towards = fill_towards; - if (earliest && earliest->content->audio) { - audio_fill_towards += DCPTime::from_seconds (earliest->content->audio->delay() / 1000.0); + if (!_silent.done() && (!earliest_time || _silent.position() < *earliest_time)) { + earliest_time = _silent.position (); + which = SILENT; } - if (audio_fill_from && audio_fill_from < audio_fill_towards) { - DCPTimePeriod period (*audio_fill_from, audio_fill_towards); + switch (which) { + case CONTENT: + earliest_content->done = earliest_content->decoder->pass (); + break; + case BLACK: + 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 (period.duration() > one_video_frame()) { period.to = period.from + one_video_frame(); } - list p = subtract(period, _no_audio); - if (!p.empty ()) { - fill_audio (p.front()); - filled = true; - } + fill_audio (period); + _silent.set_position (period.to); + break; } - - if (earliest) { - earliest->done = earliest->decoder->pass (); + case NONE: + done = true; + break; } /* Emit any audio that is ready */ - DCPTime pull_to = _playlist->length (); + /* 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; - } - - if (_last_audio_time) { + } 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); } - return !earliest && !filled; + if (done) { + _shuffler->flush (); + } + return done; } optional @@ -618,7 +650,7 @@ Player::subtitles_for_frame (DCPTime time) const { list subtitles; - BOOST_FOREACH (PlayerSubtitles i, _active_subtitles.get_burnt (time, _always_burn_subtitles)) { + BOOST_FOREACH (PlayerSubtitles i, _active_subtitles.get_burnt (DCPTimePeriod(time, time + DCPTime::from_frames(1, _film->video_frame_rate())), _always_burn_subtitles)) { /* Image subtitles */ list c = transform_image_subtitles (i.image); @@ -651,9 +683,8 @@ 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 ( @@ -665,20 +696,33 @@ Player::video (weak_ptr wp, ContentVideo video) /* Fill gaps that we discover now that we have some video which needs to be emitted */ - optional fill_to; if (_last_video_time) { - fill_to = _last_video_time; - } - - if (fill_to) { - /* XXX: this may not work for 3D */ - BOOST_FOREACH (DCPTimePeriod i, subtract(DCPTimePeriod (*fill_to, time), _no_video)) { - for (DCPTime j = i.from; j < i.to; j += one_video_frame()) { - LastVideoMap::const_iterator k = _last_video.find (wp); - if (k != _last_video.end ()) { - emit_video (k->second, j); + DCPTime fill_from = max (*_last_video_time, piece->content->position()); + 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 < time || eyes != video.eyes) { + if (last != _last_video.end()) { + last->second->set_eyes (eyes); + emit_video (last->second, 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 < time; j += one_video_frame()) { + if (last != _last_video.end()) { + emit_video (last->second, j); } else { - emit_video (black_player_video_frame(), j); + emit_video (black_player_video_frame(EYES_BOTH), j); } } } @@ -699,61 +743,11 @@ Player::video (weak_ptr wp, ContentVideo video) ) ); - emit_video (_last_video[wp], time); -} - -/** Do our common processing on some audio */ -void -Player::audio_transform (shared_ptr content, AudioStreamPtr stream, ContentAudio content_audio, DCPTime time) -{ - DCPOMATIC_ASSERT (content_audio.audio->frames() > 0); - - /* Gain */ - - if (content->gain() != 0) { - shared_ptr gain (new AudioBuffers (content_audio.audio)); - gain->apply_gain (content->gain ()); - content_audio.audio = gain; - } - - /* Remap */ - - shared_ptr dcp_mapped (new AudioBuffers (_film->audio_channels(), content_audio.audio->frames())); - dcp_mapped->make_silent (); - - AudioMapping map = stream->mapping (); - for (int i = 0; i < map.input_channels(); ++i) { - for (int j = 0; j < dcp_mapped->channels(); ++j) { - if (map.get (i, static_cast (j)) > 0) { - dcp_mapped->accumulate_channel ( - content_audio.audio.get(), - i, - static_cast (j), - map.get (i, static_cast (j)) - ); - } - } - } - - content_audio.audio = dcp_mapped; - - /* Process */ - - if (_audio_processor) { - content_audio.audio = _audio_processor->run (content_audio.audio, _film->audio_channels ()); - } - - /* Pad any gap which may be caused by audio delay */ - - if (_last_audio_time) { - fill_audio (DCPTimePeriod (*_last_audio_time, time)); + DCPTime t = time; + for (int i = 0; i < frc.repeat; ++i) { + emit_video (_last_video[wp], t); + t += one_video_frame (); } - - /* Push */ - - _audio_merger.push (content_audio.audio, time); - DCPOMATIC_ASSERT (_stream_states.find (stream) != _stream_states.end ()); - _stream_states[stream].last_push_end = time + DCPTime::from_frames (content_audio.audio->frames(), _film->audio_frame_rate()); } void @@ -770,7 +764,7 @@ Player::audio (weak_ptr wp, AudioStreamPtr stream, ContentAudio content_a DCPOMATIC_ASSERT (content); /* Compute time in the DCP */ - DCPTime time = resampled_audio_to_dcp (piece, content_audio.frame) + DCPTime::from_seconds (content->delay() / 1000.0); + DCPTime time = resampled_audio_to_dcp (piece, content_audio.frame); /* And the end of this block in the DCP */ DCPTime end = time + DCPTime::from_frames(content_audio.audio->frames(), content->resampled_frame_rate()); @@ -796,7 +790,31 @@ Player::audio (weak_ptr wp, AudioStreamPtr stream, ContentAudio content_a content_audio.audio = cut; } - audio_transform (content, stream, content_audio, time); + DCPOMATIC_ASSERT (content_audio.audio->frames() > 0); + + /* Gain */ + + if (content->gain() != 0) { + shared_ptr gain (new AudioBuffers (content_audio.audio)); + gain->apply_gain (content->gain ()); + content_audio.audio = gain; + } + + /* Remap */ + + content_audio.audio = remap (content_audio.audio, _film->audio_channels(), stream->mapping()); + + /* Process */ + + if (_audio_processor) { + content_audio.audio = _audio_processor->run (content_audio.audio, _film->audio_channels ()); + } + + /* Push */ + + _audio_merger.push (content_audio.audio, time); + DCPOMATIC_ASSERT (_stream_states.find (stream) != _stream_states.end ()); + _stream_states[stream].last_push_end = time + DCPTime::from_frames (content_audio.audio->frames(), _film->audio_frame_rate()); } void @@ -889,6 +907,14 @@ Player::subtitle_stop (weak_ptr wp, ContentTime to) void Player::seek (DCPTime time, bool accurate) { + if (!_have_valid_pieces) { + setup_pieces (); + } + + if (_shuffler) { + _shuffler->clear (); + } + if (_audio_processor) { _audio_processor->flush (); } @@ -913,11 +939,18 @@ 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(); } + + _black.set_position (time); + _silent.set_position (time); + + _last_video.clear (); } void @@ -934,13 +967,16 @@ Player::emit_video (shared_ptr pv, DCPTime time) _last_video_time = time + one_video_frame(); _active_subtitles.clear_before (time); } + _last_video_eyes = increment_eyes (pv->eyes()); } void Player::emit_audio (shared_ptr data, DCPTime time) { + /* 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 ()); + _last_audio_time = time + DCPTime::from_frames (data->frames(), _film->audio_frame_rate()); } void @@ -950,19 +986,18 @@ Player::fill_audio (DCPTimePeriod period) return; } - cout << "fillin " << to_string(period.from) << " to " << to_string(period.to) << "\n"; - BOOST_FOREACH (DCPTimePeriod i, subtract(period, _no_audio)) { - DCPTime t = i.from; - while (t < i.to) { - DCPTime block = min (DCPTime::from_seconds (0.5), i.to - t); - Frame const samples = block.frames_round(_film->audio_frame_rate()); - if (samples) { - shared_ptr silence (new AudioBuffers (_film->audio_channels(), samples)); - silence->make_silent (); - emit_audio (silence, t); - } - t += block; + DCPOMATIC_ASSERT (period.from < period.to); + + DCPTime t = period.from; + while (t < period.to) { + DCPTime block = min (DCPTime::from_seconds (0.5), period.to - t); + Frame const samples = block.frames_round(_film->audio_frame_rate()); + if (samples) { + shared_ptr silence (new AudioBuffers (_film->audio_channels(), samples)); + silence->make_silent (); + emit_audio (silence, t); } + t += block; } } @@ -985,3 +1020,15 @@ 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 (false); +}