X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fplayer.cc;h=87d8b9d97913553c4f090211f5dcb9b32ffd26f1;hb=0a33b35732450d91e39b725ace6cf3e51ab9bc3a;hp=31c3c26e496db5d6bc808d0d1c3e266d18d5e9dd;hpb=3d90ce7a500a33b6147c30b65766efcbc447f5ab;p=dcpomatic.git diff --git a/src/lib/player.cc b/src/lib/player.cc index 31c3c26e4..87d8b9d97 100644 --- a/src/lib/player.cc +++ b/src/lib/player.cc @@ -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 @@ -122,10 +124,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 (); @@ -286,12 +284,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, @@ -509,25 +506,38 @@ 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) { + /* XXX: fill up to the length of Playlist with black / silence */ return true; } - cout << "Pass " << earliest->content->path(0) << "\n"; - earliest->decoder->pass (); + earliest->done = earliest->decoder->pass (); /* Emit any audio that is ready */ - pair, DCPTime> audio = _audio_merger.pull (earliest_position); + optional earliest_audio; + BOOST_FOREACH (shared_ptr i, _pieces) { + if (i->decoder->audio) { + DCPTime const t = i->content->position() + DCPTime (i->decoder->audio->position(), i->frc); + if (!earliest_audio || t < *earliest_audio) { + earliest_audio = t; + } + } + } + + pair, DCPTime> audio = _audio_merger.pull (earliest_audio.get_value_or(DCPTime())); if (audio.first->frames() > 0) { DCPOMATIC_ASSERT (audio.second >= _last_audio_time); DCPTime t = _last_audio_time; @@ -559,25 +569,30 @@ Player::video (weak_ptr wp, ContentVideo video) DCPTime const time = content_video_to_dcp (piece, video.frame.index()); DCPTimePeriod const period (time, time + DCPTime::from_frames (1, _film->video_frame_rate())); + /* 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)); } @@ -588,12 +603,14 @@ 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 (_last_time) { + /* XXX: this may not work for 3D */ + DCPTime const frame = DCPTime::from_frames (1, _film->video_frame_rate()); + for (DCPTime i = _last_time.get() + frame; i < time; i += frame) { if (_playlist->video_content_at(i) && _last_video) { - Video (_last_video->clone (i)); + Video (shared_ptr (new PlayerVideo (*_last_video)), i); } else { - Video (black_player_video_frame (i)); + Video (black_player_video_frame (), i); } } } @@ -601,7 +618,6 @@ Player::video (weak_ptr wp, ContentVideo video) _last_video.reset ( new PlayerVideo ( video.image, - time, piece->content->video->crop (), piece->content->video->fade (video.frame.index()), piece->content->video->scale().size ( @@ -618,18 +634,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); } @@ -648,22 +663,28 @@ Player::audio (weak_ptr wp, AudioStreamPtr stream, ContentAudio content_a shared_ptr content = piece->content->audio; DCPOMATIC_ASSERT (content); - shared_ptr audio = content_audio.audio; - /* 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; + } + + /* 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 const time = resampled_audio_to_dcp (piece, content_audio.frame) + DCPTime::from_seconds (content->delay() / 1000); + DCPTime time = resampled_audio_to_dcp (piece, content_audio.frame) + DCPTime::from_seconds (content->delay() / 1000); /* 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 (); @@ -671,7 +692,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)) @@ -680,13 +701,23 @@ Player::audio (weak_ptr wp, AudioStreamPtr stream, ContentAudio content_a } } - audio = dcp_mapped; + content_audio.audio = dcp_mapped; 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); + /* XXX: this may be nonsense */ + if (time < _audio_merger.last_pull()) { + DCPTime const discard_time = _audio_merger.last_pull() - time; + Frame discard_frames = discard_time.frames_round(_film->audio_frame_rate()); + content_audio.audio.reset (new AudioBuffers (_film->audio_channels(), content_audio.audio->frames() - discard_frames)); + time += discard_time; + } + + if (content_audio.audio->frames() > 0) { + _audio_merger.push (content_audio.audio, time); + } } void @@ -711,12 +742,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); } } @@ -729,6 +760,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 ()); @@ -750,18 +782,16 @@ 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); } } @@ -771,12 +801,40 @@ Player::seek (DCPTime time, bool accurate) 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 - DCPTime::from_frames (1, _film->video_frame_rate ()); } 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; }