X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fplayer.cc;h=2e47da5bfc9306c16077410be99dc7b5d00d7415;hb=3c86d70cf46ca11212ae2e2f4d711db0f478c2f5;hp=dd064d3cdc221b44df74d32b958cf4ade2245e72;hpb=65f95aa3614fc1b633c38e173349b123a191447f;p=dcpomatic.git diff --git a/src/lib/player.cc b/src/lib/player.cc index dd064d3cd..2e47da5bf 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 @@ -171,8 +170,8 @@ Player::setup_pieces () } } - _last_video_time = optional (); - _last_audio_time = optional (); + _last_video_time = DCPTime (); + _last_audio_time = DCPTime (); _have_valid_pieces = true; } @@ -519,7 +518,7 @@ Player::pass () BOOST_FOREACH (shared_ptr i, _pieces) { if (!i->done) { - DCPTime const t = i->content->position() + DCPTime (i->decoder->position(), i->frc); + DCPTime const t = content_time_to_dcp (i, i->decoder->position()); if (!earliest || t < earliest_content) { earliest_content = t; earliest = i; @@ -527,40 +526,73 @@ Player::pass () } } - 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); - } + /* 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()); + + /* 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; + } + + 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 (_last_video_time) { - fill_video (DCPTimePeriod (_last_video_time.get(), earliest ? earliest_content : _playlist->length())); - } else if (_last_seek_time) { - fill_video (DCPTimePeriod (_last_seek_time.get(), _last_seek_time.get() + one_video_frame ())); + optional audio_fill_from; + if (_last_audio_time) { + /* Fill from the last audio or seek time */ + audio_fill_from = _last_audio_time; } - /* XXX: fill audio */ + DCPTime audio_fill_towards = fill_towards; + if (earliest && earliest->content->audio) { + audio_fill_towards += DCPTime::from_seconds (earliest->content->audio->delay() / 1000.0); + } + + if (audio_fill_from && audio_fill_from < audio_fill_towards) { + DCPTimePeriod period (*audio_fill_from, audio_fill_towards); + 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; + } + } - if (!earliest) { - return true; + if (earliest) { + earliest->done = earliest->decoder->pass (); } /* Emit any audio that is ready */ - DCPTime pull_from = _playlist->length (); + DCPTime pull_to = _playlist->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_from) { - pull_from = i->second.last_push_end; + if (!i->second.piece->done && i->second.last_push_end < pull_to) { + pull_to = i->second.last_push_end; } } - list, DCPTime> > audio = _audio_merger.pull (pull_from); + 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.get()) { + 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. */ @@ -572,15 +604,13 @@ Player::pass () } if (_last_audio_time) { - /* XXX: does this remain necessary? */ - fill_audio (DCPTimePeriod (_last_audio_time.get(), i->second)); + fill_audio (DCPTimePeriod (*_last_audio_time, i->second)); } - Audio (i->first, i->second); - _last_audio_time = i->second + DCPTime::from_frames(i->first->frames(), _film->audio_frame_rate()); + emit_audio (i->first, i->second); } - return false; + return !earliest && !filled; } optional @@ -626,18 +656,35 @@ Player::video (weak_ptr wp, ContentVideo video) 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)) { + if ( + time < piece->content->position() || + time >= piece->content->end() || + (_last_video_time && time < *_last_video_time)) { return; } - /* Fill gaps caused by (the hopefully rare event of) a decoder not emitting contiguous video */ + /* Fill gaps that we discover now that we have some video which needs to be emitted */ - /* XXX: is this necessary? can it be done by the fill in pass? */ + optional fill_to; if (_last_video_time) { - fill_video (DCPTimePeriod (_last_video_time.get(), 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); + } + } + } } - _last_video.reset ( + _last_video[wp].reset ( new PlayerVideo ( video.image, piece->content->video->crop (), @@ -652,42 +699,7 @@ Player::video (weak_ptr wp, ContentVideo video) ) ); - optional subtitles = subtitles_for_frame (time); - if (subtitles) { - _last_video->set_subtitle (subtitles.get ()); - } - - Video (_last_video, time); - - _last_video_time = time + one_video_frame (); - - _active_subtitles.clear_before (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); + emit_video (_last_video[wp], time); } /** Do our common processing on some audio */ @@ -706,24 +718,7 @@ Player::audio_transform (shared_ptr content, AudioStreamPtr stream /* 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; + content_audio.audio = remap (content_audio.audio, _film->audio_channels(), stream->mapping()); /* Process */ @@ -751,17 +746,6 @@ Player::audio (weak_ptr wp, AudioStreamPtr stream, ContentAudio content_a 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); /* And the end of this block in the DCP */ @@ -781,7 +765,9 @@ Player::audio (weak_ptr wp, AudioStreamPtr stream, ContentAudio content_a return; } else if (end > piece->content->end()) { Frame const remaining_frames = DCPTime(piece->content->end() - time).frames_round(_film->audio_frame_rate()); - DCPOMATIC_ASSERT (remaining_frames > 0); + if (remaining_frames == 0) { + return; + } 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; @@ -884,11 +870,6 @@ Player::seek (DCPTime time, bool accurate) _audio_processor->flush (); } - for (ResamplerMap::iterator i = _resamplers.begin(); i != _resamplers.end(); ++i) { - i->second->flush (); - i->second->reset (); - } - _audio_merger.clear (); _active_subtitles.clear (); @@ -911,64 +892,43 @@ Player::seek (DCPTime time, bool accurate) _last_video_time = time; _last_audio_time = time; } else { - _last_video_time = optional (); - _last_audio_time = optional (); + _last_video_time = optional(); + _last_audio_time = optional(); } - - _last_seek_time = time; } -shared_ptr -Player::resampler (shared_ptr content, AudioStreamPtr stream, bool create) +void +Player::emit_video (shared_ptr pv, DCPTime time) { - ResamplerMap::const_iterator i = _resamplers.find (make_pair (content, stream)); - if (i != _resamplers.end ()) { - return i->second; - } - - if (!create) { - return shared_ptr (); + optional subtitles = subtitles_for_frame (time); + if (subtitles) { + pv->set_subtitle (subtitles.get ()); } - LOG_GENERAL ( - "Creating new resampler from %1 to %2 with %3 channels", - stream->frame_rate(), - content->resampled_frame_rate(), - stream->channels() - ); + Video (pv, time); - shared_ptr r ( - new Resampler (stream->frame_rate(), content->resampled_frame_rate(), stream->channels()) - ); - - _resamplers[make_pair(content, stream)] = r; - return r; + if (pv->eyes() == EYES_BOTH || pv->eyes() == EYES_RIGHT) { + _last_video_time = time + one_video_frame(); + _active_subtitles.clear_before (time); + } } void -Player::fill_video (DCPTimePeriod period) -{ - /* XXX: this may not work for 3D */ - BOOST_FOREACH (DCPTimePeriod i, subtract(period, _no_video)) { - for (DCPTime j = i.from; j < i.to; j += one_video_frame()) { - if (_playlist->video_content_at(j) && _last_video) { - Video (shared_ptr (new PlayerVideo (*_last_video)), j); - } else { - shared_ptr black = black_player_video_frame (); - optional subtitles = subtitles_for_frame (j); - if (subtitles) { - black->set_subtitle (subtitles.get ()); - } - Video (black, j); - } - _last_video_time = j; - } - } +Player::emit_audio (shared_ptr data, DCPTime time) +{ + Audio (data, time); + _last_audio_time = time + DCPTime::from_frames (data->frames(), _film->audio_frame_rate ()); } void Player::fill_audio (DCPTimePeriod period) { + if (period.from == period.to) { + return; + } + + DCPOMATIC_ASSERT (period.from < period.to); + BOOST_FOREACH (DCPTimePeriod i, subtract(period, _no_audio)) { DCPTime t = i.from; while (t < i.to) { @@ -977,7 +937,7 @@ Player::fill_audio (DCPTimePeriod period) if (samples) { shared_ptr silence (new AudioBuffers (_film->audio_channels(), samples)); silence->make_silent (); - Audio (silence, t); + emit_audio (silence, t); } t += block; }