X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fplayer.cc;h=adaee931e1dcb19347672a59a575df96c8fac614;hb=081f974c2c75c306d07d5a6f5da6847826a05a9c;hp=44e2d16526ffddf58425f4c965dc4ee501937857;hpb=ee7c1a2abfaf7aa9ca31618cdd7f354a3076ceff;p=dcpomatic.git diff --git a/src/lib/player.cc b/src/lib/player.cc index 44e2d1652..adaee931e 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) @@ -122,8 +121,8 @@ 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); @@ -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)); } } @@ -156,22 +156,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 (_playlist, bind(&Content::video, _1)); + _silent = Empty (_playlist, bind(&Content::audio, _1)); - _last_video_time = optional (); - _last_audio_time = optional (); + _last_video_time = DCPTime (); + _last_audio_time = DCPTime (); _have_valid_pieces = true; } @@ -370,8 +359,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,11 +406,10 @@ Player::set_ignore_video () _ignore_video = true; } -/** Set this player never to produce any audio data */ void -Player::set_ignore_audio () +Player::set_ignore_subtitle () { - _ignore_audio = true; + _ignore_subtitle = true; } /** Set whether or not this player should always burn text subtitles into the image, @@ -513,23 +502,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 () { @@ -537,62 +509,98 @@ Player::pass () setup_pieces (); } + /* Find the decoder or empty which is farthest behind where we are and make it emit some data */ + shared_ptr earliest; DCPTime earliest_content; 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) { + 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 || t < earliest_content || (t == earliest_content && i->decoder->subtitle)) { earliest_content = t; earliest = i; } } } - if (!earliest) { - /* No more content; fill up with silent black */ - DCPTimePeriod remaining_video (DCPTime(), _playlist->length()); - if (_last_video_time) { - remaining_video.from = _last_video_time.get() + one_video_frame(); - } - fill_video (remaining_video); - DCPTimePeriod remaining_audio (DCPTime(), _playlist->length()); - if (_last_audio_time) { - remaining_audio.from = _last_audio_time.get(); - } - fill_audio (remaining_audio); - return true; - } + bool done = false; - 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); + if (!_black.done() && (!earliest || _black.position() < earliest_content)) { + /* There is some black that must be emitted */ + emit_video (black_player_video_frame(), _black.position()); + _black.set_position (_black.position() + one_video_frame()); + } else if (!_silent.done() && (!earliest || _silent.position() < earliest_content)) { + /* There is some silence that must be emitted */ + DCPTimePeriod period (_silent.period_at_position()); + if (period.duration() > one_video_frame()) { + period.to = period.from + one_video_frame(); } + fill_audio (period); + _silent.set_position (period.to); + } else if (_playlist->length() == DCPTime()) { + /* Special case of an empty Film; just give one black frame */ + emit_video (black_player_video_frame(), DCPTime()); + } else if (earliest) { + earliest->done = earliest->decoder->pass (); + } else { + done = true; } /* 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 (!_last_audio_time || i->second >= _last_audio_time.get()); - if (_last_audio_time) { - fill_audio (DCPTimePeriod (_last_audio_time.get(), i->second)); + 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; } - 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 done; +} + +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 false; + return merge (subtitles); } void @@ -612,45 +620,30 @@ 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()) { - 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; - - /* 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)); - } + /* Fill gaps that we discover now that we have some video which needs to be emitted */ - if (!sub_images.empty ()) { - subtitles = merge (sub_images); + 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); + } } } - /* Fill gaps */ - - if (_last_video_time) { - fill_video (DCPTimePeriod (_last_video_time.get() + one_video_frame(), time)); + /* 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; } - _last_video.reset ( + _last_video[wp].reset ( new PlayerVideo ( video.image, piece->content->video->crop (), @@ -665,54 +658,51 @@ Player::video (weak_ptr wp, ContentVideo video) ) ); - if (subtitles) { - _last_video->set_subtitle (subtitles.get ()); - } - - _last_video_time = time; - - Video (_last_video, *_last_video_time); - - /* Discard any subtitles we no longer need */ - - for (list >::iterator i = _subtitles.begin (); i != _subtitles.end(); ) { - list >::iterator tmp = i; - ++tmp; - - if (i->second.to < time) { - _subtitles.erase (i); - } - - i = tmp; - } + emit_video (_last_video[wp], time); } void -Player::audio_flush (shared_ptr piece, AudioStreamPtr stream) +Player::audio (weak_ptr wp, AudioStreamPtr stream, ContentAudio content_audio) { - shared_ptr content = piece->content->audio; - DCPOMATIC_ASSERT (content); + DCPOMATIC_ASSERT (content_audio.audio->frames() > 0); - shared_ptr r = resampler (content, stream, false); - if (!r) { + shared_ptr piece = wp.lock (); + if (!piece) { return; } - pair, Frame> ro = r->flush (); - ContentAudio content_audio; - content_audio.audio = ro.first; - content_audio.frame = ro.second; + shared_ptr content = piece->content->audio; + 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()); - audio_transform (content, stream, content_audio, time); -} + /* Remove anything that comes before the start or after the end of the content */ + if (time < piece->content->position()) { + 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, 0, 0); + content_audio.audio = cut; + } + + DCPOMATIC_ASSERT (content_audio.audio->frames() > 0); -/** Do our common processing on some audio */ -void -Player::audio_transform (shared_ptr content, AudioStreamPtr stream, ContentAudio content_audio, DCPTime time) -{ /* Gain */ if (content->gain() != 0) { @@ -723,24 +713,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 */ @@ -756,57 +729,7 @@ Player::audio_transform (shared_ptr content, AudioStreamPtr stream } void -Player::audio (weak_ptr wp, AudioStreamPtr stream, ContentAudio content_audio) -{ - shared_ptr piece = wp.lock (); - if (!piece) { - return; - } - - 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); - 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 */ - DCPTime end = time + DCPTime::from_frames(content_audio.audio->frames(), content->resampled_frame_rate()); - - /* 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) { - /* This audio is entirely discarded */ - return; - } - shared_ptr cut (new AudioBuffers (content_audio.audio->channels(), remaining_frames)); - cut->copy_from (content_audio.audio.get(), remaining_frames, discard_frames, 0); - content_audio.audio = cut; - time += discard_time; - } 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()); - 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); -} - -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) { @@ -827,17 +750,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) { @@ -845,7 +764,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 ()); @@ -867,16 +786,32 @@ 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)); } } @@ -887,79 +822,80 @@ Player::seek (DCPTime time, bool accurate) _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_video_time = time - one_video_frame (); + _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(); } + + _black.set_position (time); + _silent.set_position (time); + + _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() - ); + 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) +Player::emit_audio (shared_ptr data, DCPTime time) { - /* 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); - } - } - } + Audio (data, time); + _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 (); - 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; } } @@ -968,3 +904,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); +}