X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fplayer.cc;h=7c2048489db81f5c9950aee6004430ebebde2f49;hb=89aa9d4ba69e471949f791cdafe4ae20cea554d2;hp=924e60be219122251e50594039c5b4a57b75ea01;hpb=c6b0eb4db564abd41aa0685367a8660d7091e8f8;p=dcpomatic.git diff --git a/src/lib/player.cc b/src/lib/player.cc index 924e60be2..7c2048489 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 @@ -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,6 +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()) { _film_changed_connection = _film->Changed.connect (bind (&Player::film_changed, this, _1)); _playlist_changed_connection = _playlist->Changed.connect (bind (&Player::playlist_changed, this)); @@ -139,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 (); @@ -156,7 +137,7 @@ Player::setup_pieces () } if (decoder->audio) { - decoder->audio->Data.connect (bind (&Player::audio, this, weak_ptr (piece), _1)); + decoder->audio->Data.connect (bind (&Player::audio, this, weak_ptr (piece), _1, _2)); } if (decoder->subtitle) { @@ -303,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, @@ -354,8 +334,16 @@ Player::dcp_to_resampled_audio (shared_ptr piece, DCPTime t) const return max (DCPTime (), DCPTime (piece->content->trim_start (), piece->frc) + s).frames_floor (_film->audio_frame_rate ()); } +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 ()); +} + ContentTime -Player::dcp_to_content_subtitle (shared_ptr piece, DCPTime t) const +Player::dcp_to_content_time (shared_ptr piece, DCPTime t) const { DCPTime s = t - piece->content->position (); s = min (piece->content->length_after_trim(), s); @@ -363,7 +351,7 @@ Player::dcp_to_content_subtitle (shared_ptr piece, DCPTime t) const } DCPTime -Player::content_subtitle_to_dcp (shared_ptr piece, ContentTime t) const +Player::content_time_to_dcp (shared_ptr piece, ContentTime t) const { return max (DCPTime (), DCPTime (t - piece->content->trim_start(), piece->frc) + piece->content->position()); } @@ -518,14 +506,54 @@ Player::pass () } shared_ptr earliest; - DCPTime earliest_position; + 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) { + earliest_content = t; + earliest = i; + } + } + } + + if (!earliest) { + return true; + } + + earliest->done = earliest->decoder->pass (); + + /* Emit any audio that is ready */ + + optional earliest_audio; BOOST_FOREACH (shared_ptr i, _pieces) { - /* Convert i->decoder->position() to DCPTime and work out the earliest */ + 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; + } + } } - earliest->decoder->pass (); + 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; + 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; + } + + Audio (audio.first, audio.second); + _last_audio_time = audio.second; + } - /* XXX: collect audio and maybe emit some */ + return false; } void @@ -536,58 +564,276 @@ Player::video (weak_ptr wp, ContentVideo video) return; } - /* Get subs to burn in and burn them in */ + /* 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())); + /* Discard if it's outside the content's period */ + if (time < piece->content->position() || time >= piece->content->end()) { + return; + } - /* Fill gaps */ + /* Get any subtitles */ - DCPTime time = content_video_to_dcp (piece, video.frame.index()); + optional subtitles; - dcp::Size image_size = piece->content->video->scale().size ( - piece->content->video, _video_container_size, _film->frame_size () - ); + for (list >::const_iterator i = _subtitles.begin(); i != _subtitles.end(); ++i) { - Video ( - shared_ptr ( - new PlayerVideo ( - video.image, - time, - piece->content->video->crop (), - piece->content->video->fade (video.frame.index()), - image_size, - _video_container_size, - video.frame.eyes(), - video.part, - piece->content->video->colour_conversion () - ) + 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)); + } + + if (!sub_images.empty ()) { + subtitles = merge (sub_images); + } + } + + /* Fill gaps */ + + 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 (shared_ptr (new PlayerVideo (*_last_video)), i); + } else { + Video (black_player_video_frame (), i); + } + } + } + + _last_video.reset ( + new PlayerVideo ( + video.image, + piece->content->video->crop (), + piece->content->video->fade (video.frame.index()), + piece->content->video->scale().size ( + piece->content->video, _video_container_size, _film->frame_size () + ), + _video_container_size, + video.frame.eyes(), + video.part, + piece->content->video->colour_conversion () ) ); + if (subtitles) { + _last_video->set_subtitle (subtitles.get ()); + } + + _last_time = time; + + 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; + ++tmp; + + if (i->second.to < time) { + _subtitles.erase (i); + } + + i = tmp; + } } void -Player::audio (weak_ptr piece, ContentAudio video) +Player::audio (weak_ptr wp, AudioStreamPtr stream, ContentAudio content_audio) { - /* gain, remap, processor */ - /* Put into merge buffer */ + shared_ptr piece = wp.lock (); + if (!piece) { + return; + } + + 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); + + /* 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 ()); + } + + /* 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 -Player::image_subtitle (weak_ptr piece, ContentImageSubtitle subtitle) +Player::image_subtitle (weak_ptr wp, ContentImageSubtitle subtitle) { - /* Store for video to see */ + shared_ptr piece = wp.lock (); + if (!piece) { + return; + } + + /* Apply content's subtitle offsets */ + subtitle.sub.rectangle.x += piece->content->subtitle->x_offset (); + subtitle.sub.rectangle.y += piece->content->subtitle->y_offset (); + + /* Apply content's subtitle scale */ + subtitle.sub.rectangle.width *= piece->content->subtitle->x_scale (); + subtitle.sub.rectangle.height *= piece->content->subtitle->y_scale (); + + /* Apply a corrective translation to keep the subtitle centred after that scale */ + subtitle.sub.rectangle.x -= subtitle.sub.rectangle.width * (piece->content->subtitle->x_scale() - 1); + subtitle.sub.rectangle.y -= subtitle.sub.rectangle.height * (piece->content->subtitle->y_scale() - 1); + + 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)); + + if (piece->content->subtitle->use() && (piece->content->subtitle->burn() || _always_burn_subtitles)) { + _subtitles.push_back (make_pair (ps, period)); + } else { + Subtitle (ps, period); + } } void -Player::text_subtitle (weak_ptr piece, ContentTextSubtitle subtitle) +Player::text_subtitle (weak_ptr wp, ContentTextSubtitle subtitle) { - /* Store for video to see, or emit */ + shared_ptr piece = wp.lock (); + if (!piece) { + return; + } + + 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 ()); + s.set_v_position (s.v_position() + piece->content->subtitle->y_offset ()); + float const xs = piece->content->subtitle->x_scale(); + float const ys = piece->content->subtitle->y_scale(); + float size = s.size(); + + /* Adjust size to express the common part of the scaling; + e.g. if xs = ys = 0.5 we scale size by 2. + */ + if (xs > 1e-5 && ys > 1e-5) { + size *= 1 / min (1 / xs, 1 / ys); + } + s.set_size (size); + + /* Then express aspect ratio changes */ + if (fabs (1.0 - xs / ys) > dcp::ASPECT_ADJUST_EPSILON) { + s.set_aspect_adjust (xs / ys); + } + + 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 (make_pair (ps, period)); + } else { + Subtitle (ps, period); + } } void 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 - DCPTime::from_frames (1, _film->video_frame_rate ()); + _last_time = time - DCPTime::from_frames (1, _film->video_frame_rate ()); + } else { + _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; }