X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fplayer.cc;h=11369b682b97879e692b3b415b70978440f8841c;hb=ccbf3d0f3f17b87f0edd18b40c1a14649c559d92;hp=bd33963a0234d0cb430c1106733a9d895914a4fc;hpb=d892e433ac6c14890b7f87052eda38556abb6b62;p=dcpomatic.git diff --git a/src/lib/player.cc b/src/lib/player.cc index bd33963a0..11369b682 100644 --- a/src/lib/player.cc +++ b/src/lib/player.cc @@ -47,7 +47,6 @@ #include "content_subtitle.h" #include "dcp_decoder.h" #include "image_decoder.h" -#include "resampler.h" #include "compose.hpp" #include #include @@ -83,7 +82,7 @@ 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) @@ -110,7 +109,7 @@ Player::setup_pieces () 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) { @@ -122,13 +121,16 @@ 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)); @@ -157,19 +159,8 @@ 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_audio_time = DCPTime (); @@ -371,8 +362,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 @@ -417,6 +409,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. @@ -427,6 +425,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 () { @@ -454,7 +453,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; } @@ -514,79 +513,79 @@ 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(), 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 = i->content->position() + DCPTime (i->decoder->position(), i->frc); - if (!earliest || t < earliest_content) { - earliest_content = t; - earliest = i; + DCPTime const t = content_time_to_dcp (i, i->decoder->position()); + /* 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; } } } - if (earliest) { - earliest->done = earliest->decoder->pass (); - if (earliest->done && earliest->content->audio) { - /* Flush the Player audio system for this piece */ - BOOST_FOREACH (AudioStreamPtr i, earliest->content->audio->streams()) { - audio_flush (earliest, i); - } - } - } + bool done = false; - /* 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(); + enum { + NONE, + CONTENT, + BLACK, + SILENT + } which = NONE; - /* 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; + if (earliest_content) { + which = CONTENT; } - 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 (!_black.done() && (!earliest_time || _black.position() < *earliest_time)) { + earliest_time = _black.position (); + which = BLACK; } - optional audio_fill_from; - if (_last_audio_time && !_playlist->audio_content_at(*_last_audio_time)) { - /* Fill from the last audio or seek time */ - audio_fill_from = _last_audio_time; + if (!_silent.done() && (!earliest_time || _silent.position() < *earliest_time)) { + earliest_time = _silent.position (); + which = SILENT; } - /* XXX: _no_audio */ - if (audio_fill_from && audio_fill_from < fill_towards) { - DCPTimePeriod period (*audio_fill_from, fill_towards); + switch (which) { + case CONTENT: + earliest_content->done = earliest_content->decoder->pass (); + break; + case BLACK: + emit_video (black_player_video_frame(), _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_video); - if (!p.empty ()) { - fill_audio (period); - } - filled = true; + fill_audio (period); + _silent.set_position (period.to); + break; + } + case NONE: + done = true; + break; } /* Emit any audio that is ready */ - DCPTime pull_to = _playlist->length (); + 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; @@ -596,24 +595,21 @@ Player::pass () 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; + return done; } optional @@ -641,48 +637,41 @@ Player::subtitles_for_frame (DCPTime time) const return merge (subtitles); } -void +bool Player::video (weak_ptr wp, ContentVideo video) { shared_ptr piece = wp.lock (); if (!piece) { - return; + return false; } FrameRateChange frc(piece->content->active_video_frame_rate(), _film->video_frame_rate()); if (frc.skip && (video.frame % 2) == 1) { - return; + return false; } - /* 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)) { - return; + return false; } /* 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); - } else { - emit_video (black_player_video_frame(), j); - } + 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); } } } @@ -702,115 +691,30 @@ Player::video (weak_ptr wp, ContentVideo video) ) ); - emit_video (_last_video[wp], time); -} - -void -Player::audio_flush (shared_ptr piece, AudioStreamPtr stream) -{ - shared_ptr content = piece->content->audio; - DCPOMATIC_ASSERT (content); - - shared_ptr r = resampler (content, stream, false); - if (!r) { - return; - } - - pair, Frame> ro = r->flush (); - if (ro.first->frames() == 0) { - return; - } - - ContentAudio content_audio; - content_audio.audio = ro.first; - content_audio.frame = ro.second; - - /* Compute time in the DCP */ - DCPTime time = resampled_audio_to_dcp (piece, content_audio.frame) + DCPTime::from_seconds (content->delay() / 1000.0); - - audio_transform (content, stream, content_audio, 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 ()); + DCPTime t = time; + for (int i = 0; i < frc.repeat; ++i) { + emit_video (_last_video[wp], t); + t += one_video_frame (); } - /* Pad any gap which may be caused by audio delay */ - - if (_last_audio_time) { - fill_audio (DCPTimePeriod (*_last_audio_time, time)); - } - - /* 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()); + return true; } -void +Frame Player::audio (weak_ptr wp, AudioStreamPtr stream, ContentAudio content_audio) { DCPOMATIC_ASSERT (content_audio.audio->frames() > 0); shared_ptr piece = wp.lock (); if (!piece) { - return; + return 0; } shared_ptr content = piece->content->audio; DCPOMATIC_ASSERT (content); - /* Resample */ - if (stream->frame_rate() != content->resampled_frame_rate()) { - shared_ptr r = resampler (content, stream, true); - pair, Frame> ro = r->run (content_audio.audio, content_audio.frame); - if (ro.first->frames() == 0) { - return; - } - content_audio.audio = ro.first; - content_audio.frame = ro.second; - } - /* 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()); @@ -819,24 +723,49 @@ Player::audio (weak_ptr wp, AudioStreamPtr stream, ContentAudio content_a pair, DCPTime> cut = discard_audio (content_audio.audio, time, piece->content->position()); if (!cut.first) { /* This audio is entirely discarded */ - return; + return 0; } content_audio.audio = cut.first; time = cut.second; } else if (time > piece->content->end()) { /* Discard it all */ - return; + return 0; } else if (end > piece->content->end()) { Frame const remaining_frames = DCPTime(piece->content->end() - time).frames_round(_film->audio_frame_rate()); if (remaining_frames == 0) { - return; + return 0; } shared_ptr cut (new AudioBuffers (content_audio.audio->channels(), remaining_frames)); cut->copy_from (content_audio.audio.get(), remaining_frames, 0, 0); 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()); + return content_audio.audio->frames(); } void @@ -929,13 +858,12 @@ Player::subtitle_stop (weak_ptr wp, ContentTime to) void Player::seek (DCPTime time, bool accurate) { - if (_audio_processor) { - _audio_processor->flush (); + if (!_have_valid_pieces) { + setup_pieces (); } - for (ResamplerMap::iterator i = _resamplers.begin(); i != _resamplers.end(); ++i) { - i->second->flush (); - i->second->reset (); + if (_audio_processor) { + _audio_processor->flush (); } _audio_merger.clear (); @@ -963,33 +891,11 @@ Player::seek (DCPTime time, bool accurate) _last_video_time = optional(); _last_audio_time = optional(); } -} - -shared_ptr -Player::resampler (shared_ptr content, AudioStreamPtr stream, bool create) -{ - ResamplerMap::const_iterator i = _resamplers.find (make_pair (content, stream)); - if (i != _resamplers.end ()) { - return i->second; - } - - if (!create) { - return shared_ptr (); - } - LOG_GENERAL ( - "Creating new resampler from %1 to %2 with %3 channels", - stream->frame_rate(), - content->resampled_frame_rate(), - stream->channels() - ); + _black.set_position (time); + _silent.set_position (time); - shared_ptr r ( - new Resampler (stream->frame_rate(), content->resampled_frame_rate(), stream->channels()) - ); - - _resamplers[make_pair(content, stream)] = r; - return r; + _last_video.clear (); } void @@ -1012,24 +918,28 @@ void Player::emit_audio (shared_ptr data, DCPTime 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 Player::fill_audio (DCPTimePeriod period) { - 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; + if (period.from == period.to) { + return; + } + + 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; } } @@ -1052,3 +962,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); +}