X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fplayer.cc;h=a6df63ac0377ab6e42ecaeb476bb990d17d33c1a;hb=90c782a16c26fa8bfded51cad2bc7bbc14d8f986;hp=94c2ea37a4f45fbde6e016f0894f2b4bd70552b2;hpb=ad04d9cd5f529ab64d950c6a4c627678f3f2500d;p=dcpomatic.git diff --git a/src/lib/player.cc b/src/lib/player.cc index 94c2ea37a..a6df63ac0 100644 --- a/src/lib/player.cc +++ b/src/lib/player.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2016 Carl Hetherington + Copyright (C) 2013-2017 Carl Hetherington This file is part of DCP-o-matic. @@ -47,6 +47,8 @@ #include "content_subtitle.h" #include "dcp_decoder.h" #include "image_decoder.h" +#include "resampler.h" +#include "compose.hpp" #include #include #include @@ -76,24 +78,6 @@ using boost::dynamic_pointer_cast; using boost::optional; using boost::scoped_ptr; -static bool -has_video (Content* c) -{ - return static_cast(c->video); -} - -static bool -has_audio (Content* c) -{ - return static_cast(c->audio); -} - -static bool -has_subtitle (Content* c) -{ - return static_cast(c->subtitle); -} - Player::Player (shared_ptr film, shared_ptr playlist) : _film (film) , _playlist (playlist) @@ -103,7 +87,7 @@ Player::Player (shared_ptr film, shared_ptr playlist , _always_burn_subtitles (false) , _fast (false) , _play_referenced (false) - , _audio_merger (_film->audio_channels(), _film->audio_frame_rate()) + , _audio_merger (_film->audio_frame_rate()) { _film_changed_connection = _film->Changed.connect (bind (&Player::film_changed, this, _1)); _playlist_changed_connection = _playlist->Changed.connect (bind (&Player::playlist_changed, this)); @@ -111,6 +95,8 @@ Player::Player (shared_ptr film, shared_ptr playlist set_video_container_size (_film->frame_size ()); film_changed (Film::AUDIO_PROCESSOR); + + seek (DCPTime (), true); } void @@ -140,10 +126,6 @@ Player::setup_pieces () decoder->audio->set_ignore (); } - if (decoder->audio && _fast) { - decoder->audio->set_fast (); - } - shared_ptr dcp = dynamic_pointer_cast (decoder); if (dcp && _play_referenced) { dcp->set_decode_referenced (); @@ -166,6 +148,28 @@ Player::setup_pieces () } } + BOOST_FOREACH (shared_ptr i, _pieces) { + if (i->content->audio) { + BOOST_FOREACH (AudioStreamPtr j, i->content->audio->streams()) { + _stream_states[j] = StreamState (i, i->content->position ()); + } + } + } + + 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())); + } + } + } + } + _have_valid_pieces = true; } @@ -222,10 +226,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 @@ -304,12 +314,11 @@ Player::transform_image_subtitles (list subs) const } shared_ptr -Player::black_player_video_frame (DCPTime time) const +Player::black_player_video_frame () const { return shared_ptr ( new PlayerVideo ( shared_ptr (new RawImageProxy (_black_image)), - time, Crop (), optional (), _video_container_size, @@ -359,7 +368,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 ()); } @@ -527,39 +536,52 @@ Player::pass () } shared_ptr earliest; - DCPTime earliest_position; + DCPTime earliest_content; + BOOST_FOREACH (shared_ptr i, _pieces) { - DCPTime const t = i->content->position() + DCPTime (i->decoder->position(), i->frc); - if (!earliest || t < earliest_position) { - earliest_position = t; - earliest = i; + 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; + } } } 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_video (remaining_video); + fill_audio (DCPTimePeriod (_last_audio_time, _playlist->length())); return true; } - cout << "Pass " << earliest->content->path(0) << "\n"; - earliest->decoder->pass (); + 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); + } + } /* Emit any audio that is ready */ - pair, DCPTime> audio = _audio_merger.pull (earliest_position); - if (audio.first->frames() > 0) { - DCPOMATIC_ASSERT (audio.second >= _last_audio_time); - DCPTime t = _last_audio_time; - while (t < audio.second) { - /* Silence up to the time of this new audio */ - DCPTime block = min (DCPTime::from_seconds (0.5), audio.second - t); - shared_ptr silence (new AudioBuffers (_film->audio_channels(), block.frames_round(_film->audio_frame_rate()))); - silence->make_silent (); - Audio (silence, t); - t += block; + DCPTime pull_from = _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; } + } - Audio (audio.first, audio.second); - _last_audio_time = audio.second; + list, DCPTime> > audio = _audio_merger.pull (pull_from); + 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()); } return false; @@ -573,29 +595,39 @@ Player::video (weak_ptr wp, ContentVideo video) return; } + FrameRateChange frc(piece->content->active_video_frame_rate(), _film->video_frame_rate()); + if (frc.skip && (video.frame % 2) == 1) { + return; + } + /* Time and period of the frame we will emit */ - DCPTime const time = content_video_to_dcp (piece, video.frame.index()); - DCPTimePeriod const period (time, time + DCPTime::from_frames (1, _film->video_frame_rate())); + 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; - BOOST_FOREACH (PlayerSubtitles i, _subtitles) { + for (list >::const_iterator i = _subtitles.begin(); i != _subtitles.end(); ++i) { - if (!i.period.overlap (period)) { + if (!i->second.overlap (period)) { continue; } list sub_images; /* Image subtitles */ - list c = transform_image_subtitles (i.image); + 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.text.empty ()) { - list s = render_subtitles (i.text, i.fonts, _video_container_size, time); + 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)); } @@ -606,27 +638,20 @@ Player::video (weak_ptr wp, ContentVideo video) /* Fill gaps */ - if (_last_video_time) { - for (DCPTime i = _last_video_time.get(); i < time; i += DCPTime::from_frames (1, _film->video_frame_rate())) { - if (_playlist->video_content_at(i) && _last_video) { - Video (_last_video->clone (i)); - } else { - Video (black_player_video_frame (i)); - } - } + if (_last_time) { + fill_video (DCPTimePeriod (_last_time.get() + one_video_frame(), time)); } _last_video.reset ( new PlayerVideo ( video.image, - time, piece->content->video->crop (), - piece->content->video->fade (video.frame.index()), + piece->content->video->fade (video.frame), piece->content->video->scale().size ( piece->content->video, _video_container_size, _film->frame_size () ), _video_container_size, - video.frame.eyes(), + video.eyes, video.part, piece->content->video->colour_conversion () ) @@ -636,18 +661,17 @@ Player::video (weak_ptr wp, ContentVideo video) _last_video->set_subtitle (subtitles.get ()); } - _last_video_time = time; + _last_time = time; - cout << "Video @ " << to_string(_last_video_time.get()) << "\n"; - Video (_last_video); + Video (_last_video, *_last_time); /* Discard any subtitles we no longer need */ - for (list::iterator i = _subtitles.begin (); i != _subtitles.end(); ) { - list::iterator tmp = i; + for (list >::iterator i = _subtitles.begin (); i != _subtitles.end(); ) { + list >::iterator tmp = i; ++tmp; - if (i->period.to < time) { + if (i->second.to < time) { _subtitles.erase (i); } @@ -656,32 +680,42 @@ Player::video (weak_ptr wp, ContentVideo video) } void -Player::audio (weak_ptr wp, AudioStreamPtr stream, ContentAudio content_audio) +Player::audio_flush (shared_ptr piece, AudioStreamPtr stream) { - shared_ptr piece = wp.lock (); - if (!piece) { + shared_ptr content = piece->content->audio; + DCPOMATIC_ASSERT (content); + + shared_ptr r = resampler (content, stream, false); + if (!r) { return; } - shared_ptr content = piece->content->audio; - DCPOMATIC_ASSERT (content); + pair, Frame> ro = r->flush (); + 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); - shared_ptr audio = content_audio.audio; + 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) +{ /* Gain */ + if (content->gain() != 0) { - shared_ptr gain (new AudioBuffers (audio)); + shared_ptr gain (new AudioBuffers (content_audio.audio)); gain->apply_gain (content->gain ()); - audio = gain; + content_audio.audio = gain; } - /* XXX: end-trimming used to be checked here */ - - /* Compute time in the DCP */ - DCPTime const time = resampled_audio_to_dcp (piece, content_audio.frame) + DCPTime::from_seconds (content->delay() / 1000); + /* Remap */ - /* Remap channels */ - shared_ptr dcp_mapped (new AudioBuffers (_film->audio_channels(), audio->frames())); + shared_ptr dcp_mapped (new AudioBuffers (_film->audio_channels(), content_audio.audio->frames())); dcp_mapped->make_silent (); AudioMapping map = stream->mapping (); @@ -689,7 +723,7 @@ Player::audio (weak_ptr wp, AudioStreamPtr stream, ContentAudio content_a for (int j = 0; j < dcp_mapped->channels(); ++j) { if (map.get (i, static_cast (j)) > 0) { dcp_mapped->accumulate_channel ( - audio.get(), + content_audio.audio.get(), i, static_cast (j), map.get (i, static_cast (j)) @@ -698,13 +732,69 @@ Player::audio (weak_ptr wp, AudioStreamPtr stream, ContentAudio content_a } } - audio = dcp_mapped; + content_audio.audio = dcp_mapped; + + /* Process */ if (_audio_processor) { - audio = _audio_processor->run (audio, _film->audio_channels ()); + content_audio.audio = _audio_processor->run (content_audio.audio, _film->audio_channels ()); } - _audio_merger.push (audio, 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()); +} + +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 @@ -729,12 +819,12 @@ Player::image_subtitle (weak_ptr wp, ContentImageSubtitle subtitle) PlayerSubtitles ps; ps.image.push_back (subtitle.sub); - ps.period = DCPTimePeriod (content_time_to_dcp (piece, subtitle.period().from), content_time_to_dcp (piece, subtitle.period().to)); + DCPTimePeriod period (content_time_to_dcp (piece, subtitle.period().from), content_time_to_dcp (piece, subtitle.period().to)); if (piece->content->subtitle->use() && (piece->content->subtitle->burn() || _always_burn_subtitles)) { - _subtitles.push_back (ps); + _subtitles.push_back (make_pair (ps, period)); } else { - Subtitle (ps); + Subtitle (ps, period); } } @@ -747,6 +837,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)); BOOST_FOREACH (dcp::SubtitleString s, subtitle.subs) { s.set_h_position (s.h_position() + piece->content->subtitle->x_offset ()); @@ -768,33 +859,102 @@ Player::text_subtitle (weak_ptr wp, ContentTextSubtitle subtitle) s.set_aspect_adjust (xs / ys); } - ps.period = DCPTimePeriod (content_time_to_dcp (piece, subtitle.period().from), content_time_to_dcp (piece, subtitle.period().to)); - - s.set_in (dcp::Time(ps.period.from.seconds(), 1000)); - s.set_out (dcp::Time(ps.period.to.seconds(), 1000)); + s.set_in (dcp::Time(period.from.seconds(), 1000)); + s.set_out (dcp::Time(period.to.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 (ps); + _subtitles.push_back (make_pair (ps, period)); } else { - Subtitle (ps); + Subtitle (ps, period); } } void Player::seek (DCPTime time, bool accurate) { + if (_audio_processor) { + _audio_processor->flush (); + } + BOOST_FOREACH (shared_ptr i, _pieces) { if (i->content->position() <= time && time < i->content->end()) { i->decoder->seek (dcp_to_content_time (i, time), accurate); + i->done = false; } } if (accurate) { - _last_video_time = time - DCPTime::from_frames (1, _film->video_frame_rate ()); + _last_time = time - one_video_frame (); } else { - _last_video_time = optional (); + _last_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() + ); + + shared_ptr r ( + new Resampler (stream->frame_rate(), content->resampled_frame_rate(), stream->channels()) + ); + + _resamplers[make_pair(content, stream)] = r; + return r; +} + +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); + } + } + } +} + +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; + } + } +} + +DCPTime +Player::one_video_frame () const +{ + return DCPTime::from_frames (1, _film->video_frame_rate ()); +}