X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fplayer.cc;h=5c84ea5f525fe35786503ad081ebf956812decda;hb=6ab8e99f22bfe61bddbd204d4265071729c1f37d;hp=c14b55be01c1cf6d900080e002fd222066fb6def;hpb=58dce923b9d438a27ce1cd7e3125370f74d46e3a;p=dcpomatic.git diff --git a/src/lib/player.cc b/src/lib/player.cc index c14b55be0..5c84ea5f5 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 @@ -143,8 +142,9 @@ Player::setup_pieces () } if (decoder->subtitle) { - decoder->subtitle->ImageData.connect (bind (&Player::image_subtitle, this, weak_ptr (piece), _1)); - decoder->subtitle->TextData.connect (bind (&Player::text_subtitle, this, weak_ptr (piece), _1)); + 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)); } } @@ -170,6 +170,8 @@ Player::setup_pieces () } } + _last_video_time = DCPTime (); + _last_audio_time = DCPTime (); _have_valid_pieces = true; } @@ -226,10 +228,16 @@ Player::playlist_content_changed (weak_ptr w, int property, bool freque void Player::set_video_container_size (dcp::Size s) { + if (s == _video_container_size) { + return; + } + _video_container_size = s; _black_image.reset (new Image (AV_PIX_FMT_RGB24, _video_container_size, true)); _black_image->make_black (); + + Changed (false); } void @@ -362,7 +370,7 @@ 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); + 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 ()); } @@ -408,13 +416,6 @@ Player::set_ignore_video () _ignore_video = true; } -/** Set this player never to produce any audio data */ -void -Player::set_ignore_audio () -{ - _ignore_audio = 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. @@ -505,23 +506,6 @@ Player::get_reel_assets () return a; } -list > -Player::overlaps (DCPTime from, DCPTime to, boost::function valid) -{ - if (!_have_valid_pieces) { - setup_pieces (); - } - - list > overlaps; - BOOST_FOREACH (shared_ptr i, _pieces) { - if (valid (i->content.get ()) && i->content->position() < to && i->content->end() > from) { - overlaps.push_back (i); - } - } - - return overlaps; -} - bool Player::pass () { @@ -534,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; @@ -542,37 +526,116 @@ Player::pass () } } - if (!earliest) { - /* No more content; fill up with silent black */ - DCPTimePeriod remaining_video (DCPTime(), _playlist->length()); - if (_last_time) { - remaining_video.from = _last_time.get() + one_video_frame(); + /* 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; + } + + optional audio_fill_from; + if (_last_audio_time) { + /* Fill from the last audio or seek time */ + audio_fill_from = _last_audio_time; + } + + 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; } - fill_video (remaining_video); - fill_audio (DCPTimePeriod (_last_audio_time, _playlist->length())); - return true; } - earliest->done = earliest->decoder->pass (); + 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) { - DCPOMATIC_ASSERT (i->second >= _last_audio_time); - 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()); + 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. + */ + pair, DCPTime> cut = discard_audio (i->first, i->second, *_last_audio_time); + if (!cut.first) { + continue; + } + *i = cut; + } + + if (_last_audio_time) { + fill_audio (DCPTimePeriod (*_last_audio_time, i->second)); + } + + emit_audio (i->first, i->second); } - return false; + return !earliest && !filled; +} + +optional +Player::subtitles_for_frame (DCPTime time) const +{ + list subtitles; + + BOOST_FOREACH (PlayerSubtitles i, _active_subtitles.get_burnt (time, _always_burn_subtitles)) { + + /* Image subtitles */ + list c = transform_image_subtitles (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); + copy (s.begin(), s.end(), back_inserter (subtitles)); + } + } + + if (subtitles.empty ()) { + return optional (); + } + + return merge (subtitles); } void @@ -592,45 +655,36 @@ Player::video (weak_ptr wp, ContentVideo video) 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 */ - if (time < piece->content->position() || time >= piece->content->end()) { + /* 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; } - /* Get any subtitles */ - - optional subtitles; - - for (list >::const_iterator i = _subtitles.begin(); i != _subtitles.end(); ++i) { - - if (!i->second.overlap (period)) { - continue; - } - - list sub_images; + /* Fill gaps that we discover now that we have some video which needs to be emitted */ - /* Image subtitles */ - list c = transform_image_subtitles (i->first.image); - copy (c.begin(), c.end(), back_inserter (sub_images)); - - /* Text subtitles (rendered to an image) */ - if (!i->first.text.empty ()) { - list s = render_subtitles (i->first.text, i->first.fonts, _video_container_size, time); - copy (s.begin (), s.end (), back_inserter (sub_images)); - } - - if (!sub_images.empty ()) { - subtitles = merge (sub_images); - } + optional fill_to; + if (_last_video_time) { + fill_to = _last_video_time; } - /* Fill gaps */ - - if (_last_time) { - fill_video (DCPTimePeriod (_last_time.get() + one_video_frame(), 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 (), @@ -645,31 +699,45 @@ Player::video (weak_ptr wp, ContentVideo video) ) ); - if (subtitles) { - _last_video->set_subtitle (subtitles.get ()); - } + emit_video (_last_video[wp], time); +} - _last_time = 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); - Video (_last_video, *_last_time); + /* Gain */ - /* Discard any subtitles we no longer need */ + if (content->gain() != 0) { + shared_ptr gain (new AudioBuffers (content_audio.audio)); + gain->apply_gain (content->gain ()); + content_audio.audio = gain; + } - for (list >::iterator i = _subtitles.begin (); i != _subtitles.end(); ) { - list >::iterator tmp = i; - ++tmp; + /* Remap */ - if (i->second.to < time) { - _subtitles.erase (i); - } + content_audio.audio = remap (content_audio.audio, _film->audio_channels(), stream->mapping()); + + /* Process */ - i = tmp; + 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 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; @@ -678,73 +746,38 @@ Player::audio (weak_ptr wp, AudioStreamPtr stream, ContentAudio content_a shared_ptr content = piece->content->audio; DCPOMATIC_ASSERT (content); - /* Gain */ - if (content->gain() != 0) { - shared_ptr gain (new AudioBuffers (content_audio.audio)); - gain->apply_gain (content->gain ()); - content_audio.audio = gain; - } - - /* 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); - content_audio.audio = ro.first; - content_audio.frame = ro.second; - } - - /* XXX: end-trimming used to be checked here */ - /* 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 */ + DCPTime end = time + DCPTime::from_frames(content_audio.audio->frames(), content->resampled_frame_rate()); - /* Remove anything that comes before the start of the content */ + /* Remove anything that comes before the start or after the end of the content */ if (time < piece->content->position()) { - DCPTime const discard_time = piece->content->position() - time; - Frame discard_frames = discard_time.frames_round(_film->audio_frame_rate()); - Frame remaining_frames = content_audio.audio->frames() - discard_frames; - if (remaining_frames <= 0) { + pair, DCPTime> cut = discard_audio (content_audio.audio, time, piece->content->position()); + if (!cut.first) { /* This audio is entirely discarded */ return; } + content_audio.audio = cut.first; + time = cut.second; + } else if (time > piece->content->end()) { + /* Discard it all */ + return; + } 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; + } shared_ptr cut (new AudioBuffers (content_audio.audio->channels(), remaining_frames)); - cut->copy_from (content_audio.audio.get(), remaining_frames, discard_frames, 0); + cut->copy_from (content_audio.audio.get(), remaining_frames, 0, 0); content_audio.audio = cut; - time += discard_time; - } - - /* Remap channels */ - 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; - - if (_audio_processor) { - content_audio.audio = _audio_processor->run (content_audio.audio, _film->audio_channels ()); } - _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()); + audio_transform (content, stream, content_audio, time); } void -Player::image_subtitle (weak_ptr wp, ContentImageSubtitle subtitle) +Player::image_subtitle_start (weak_ptr wp, ContentImageSubtitle subtitle) { shared_ptr piece = wp.lock (); if (!piece) { @@ -765,17 +798,13 @@ Player::image_subtitle (weak_ptr wp, ContentImageSubtitle subtitle) PlayerSubtitles ps; ps.image.push_back (subtitle.sub); - DCPTimePeriod period (content_time_to_dcp (piece, subtitle.period().from), content_time_to_dcp (piece, subtitle.period().to)); + DCPTime from (content_time_to_dcp (piece, subtitle.from())); - if (piece->content->subtitle->use() && (piece->content->subtitle->burn() || _always_burn_subtitles)) { - _subtitles.push_back (make_pair (ps, period)); - } else { - Subtitle (ps, period); - } + _active_subtitles.add_from (wp, ps, from); } void -Player::text_subtitle (weak_ptr wp, ContentTextSubtitle subtitle) +Player::text_subtitle_start (weak_ptr wp, ContentTextSubtitle subtitle) { shared_ptr piece = wp.lock (); if (!piece) { @@ -783,7 +812,7 @@ Player::text_subtitle (weak_ptr wp, ContentTextSubtitle subtitle) } PlayerSubtitles ps; - DCPTimePeriod const period (content_time_to_dcp (piece, subtitle.period().from), content_time_to_dcp (piece, subtitle.period().to)); + DCPTime const from (content_time_to_dcp (piece, subtitle.from())); BOOST_FOREACH (dcp::SubtitleString s, subtitle.subs) { s.set_h_position (s.h_position() + piece->content->subtitle->x_offset ()); @@ -805,81 +834,103 @@ Player::text_subtitle (weak_ptr wp, ContentTextSubtitle subtitle) s.set_aspect_adjust (xs / ys); } - s.set_in (dcp::Time(period.from.seconds(), 1000)); - s.set_out (dcp::Time(period.to.seconds(), 1000)); + s.set_in (dcp::Time(from.seconds(), 1000)); ps.text.push_back (SubtitleString (s, piece->content->subtitle->outline_width())); ps.add_fonts (piece->content->subtitle->fonts ()); } - if (piece->content->subtitle->use() && (piece->content->subtitle->burn() || _always_burn_subtitles)) { - _subtitles.push_back (make_pair (ps, period)); - } else { - Subtitle (ps, period); + _active_subtitles.add_from (wp, ps, from); +} + +void +Player::subtitle_stop (weak_ptr wp, ContentTime to) +{ + if (!_active_subtitles.have (wp)) { + return; + } + + shared_ptr piece = wp.lock (); + if (!piece) { + return; + } + + DCPTime const dcp_to = content_time_to_dcp (piece, to); + + pair from = _active_subtitles.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)); } } void Player::seek (DCPTime time, bool accurate) { + if (_audio_processor) { + _audio_processor->flush (); + } + + _audio_merger.clear (); + _active_subtitles.clear (); + BOOST_FOREACH (shared_ptr i, _pieces) { - if (i->content->position() <= time && time < i->content->end()) { + if (time < i->content->position()) { + /* Before; seek to 0 */ + i->decoder->seek (ContentTime(), accurate); + i->done = false; + } else if (i->content->position() <= time && time < i->content->end()) { + /* During; seek to position */ i->decoder->seek (dcp_to_content_time (i, time), accurate); i->done = false; + } else { + /* After; this piece is done */ + i->done = true; } } if (accurate) { - _last_time = time - one_video_frame (); + _last_video_time = time; + _last_audio_time = time; } else { - _last_time = optional (); + _last_video_time = optional(); + _last_audio_time = optional(); } + + _last_video.clear (); } -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() - ); - - shared_ptr r ( - new Resampler (stream->frame_rate(), content->resampled_frame_rate(), stream->channels()) - ); + Video (pv, time); - _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 { - Video (black_player_video_frame(), 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) { @@ -888,7 +939,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; } @@ -900,3 +951,17 @@ Player::one_video_frame () const { return DCPTime::from_frames (1, _film->video_frame_rate ()); } + +pair, DCPTime> +Player::discard_audio (shared_ptr audio, DCPTime time, DCPTime discard_to) const +{ + DCPTime const discard_time = discard_to - time; + Frame const discard_frames = discard_time.frames_round(_film->audio_frame_rate()); + Frame remaining_frames = audio->frames() - discard_frames; + if (remaining_frames <= 0) { + return make_pair(shared_ptr(), DCPTime()); + } + shared_ptr cut (new AudioBuffers (audio->channels(), remaining_frames)); + cut->copy_from (audio.get(), remaining_frames, discard_frames, 0); + return make_pair(cut, time + discard_time); +}