X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fplayer.cc;h=02ae4e5c91b1b94b77b40d51c199942ab4ef10a6;hp=f83e4ed26b7368228db0cad5e476d27c05a1ab7b;hb=854f2e5bbb7ffb9758b823af87034033033f3cb8;hpb=2e504b33eb9f38cac629ad31b7c107fb0cf5efda diff --git a/src/lib/player.cc b/src/lib/player.cc index f83e4ed26..02ae4e5c9 100644 --- a/src/lib/player.cc +++ b/src/lib/player.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2013 Carl Hetherington + Copyright (C) 2013-2014 Carl Hetherington This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -38,45 +38,30 @@ #include "log.h" #include "scaler.h" #include "render_subtitles.h" +#include "dcp_video.h" +#include "config.h" +#include "content_video.h" using std::list; using std::cout; using std::min; using std::max; +using std::min; using std::vector; using std::pair; using std::map; +using std::make_pair; using boost::shared_ptr; using boost::weak_ptr; using boost::dynamic_pointer_cast; using boost::optional; -class Piece -{ -public: - Piece (shared_ptr c, shared_ptr d, FrameRateChange f) - : content (c) - , decoder (d) - , frc (f) - {} - - shared_ptr content; - shared_ptr decoder; - FrameRateChange frc; -}; - Player::Player (shared_ptr f, shared_ptr p) : _film (f) , _playlist (p) - , _video (true) - , _audio (true) , _have_valid_pieces (false) - , _video_position (0) - , _audio_position (0) - , _audio_merger (f->audio_channels(), f->audio_frame_rate ()) - , _last_emit_was_black (false) - , _just_did_inaccurate_seek (false) , _approximate_size (false) + , _burn_subtitles (false) { _playlist_changed_connection = _playlist->Changed.connect (bind (&Player::playlist_changed, this)); _playlist_content_changed_connection = _playlist->ContentChanged.connect (bind (&Player::content_changed, this, _1, _2, _3)); @@ -84,364 +69,6 @@ Player::Player (shared_ptr f, shared_ptr p) set_video_container_size (_film->frame_size ()); } -void -Player::disable_video () -{ - _video = false; -} - -void -Player::disable_audio () -{ - _audio = false; -} - -bool -Player::pass () -{ - if (!_have_valid_pieces) { - setup_pieces (); - } - - /* Interrogate all our pieces to find the one with the earliest decoded data */ - - shared_ptr earliest_piece; - shared_ptr earliest_decoded; - DCPTime earliest_time = DCPTime::max (); - DCPTime earliest_audio = DCPTime::max (); - - for (list >::iterator i = _pieces.begin(); i != _pieces.end(); ++i) { - - DCPTime const offset = (*i)->content->position() - (*i)->content->trim_start(); - - bool done = false; - shared_ptr dec; - while (!done) { - dec = (*i)->decoder->peek (); - if (!dec) { - /* Decoder has nothing else to give us */ - break; - } - - dec->set_dcp_times ((*i)->frc, offset); - DCPTime const t = dec->dcp_time - offset; - if (t >= ((*i)->content->full_length() - (*i)->content->trim_end ())) { - /* In the end-trimmed part; decoder has nothing else to give us */ - dec.reset (); - done = true; - } else if (t >= (*i)->content->trim_start ()) { - /* Within the un-trimmed part; everything's ok */ - done = true; - } else { - /* Within the start-trimmed part; get something else */ - (*i)->decoder->consume (); - } - } - - if (!dec) { - continue; - } - - if (dec->dcp_time < earliest_time) { - earliest_piece = *i; - earliest_decoded = dec; - earliest_time = dec->dcp_time; - } - - if (dynamic_pointer_cast (dec) && dec->dcp_time < earliest_audio) { - earliest_audio = dec->dcp_time; - } - } - - if (!earliest_piece) { - flush (); - return true; - } - - if (earliest_audio != DCPTime::max ()) { - if (earliest_audio.get() < 0) { - earliest_audio = DCPTime (); - } - TimedAudioBuffers tb = _audio_merger.pull (earliest_audio); - Audio (tb.audio, tb.time); - /* This assumes that the audio-frames-to-time conversion is exact - so that there are no accumulated errors caused by rounding. - */ - _audio_position += DCPTime::from_frames (tb.audio->frames(), _film->audio_frame_rate ()); - } - - /* Emit the earliest thing */ - - shared_ptr dv = dynamic_pointer_cast (earliest_decoded); - shared_ptr da = dynamic_pointer_cast (earliest_decoded); - shared_ptr dis = dynamic_pointer_cast (earliest_decoded); - shared_ptr dts = dynamic_pointer_cast (earliest_decoded); - - /* Will be set to false if we shouldn't consume the peeked DecodedThing */ - bool consume = true; - - if (dv && _video) { - - if (_just_did_inaccurate_seek) { - - /* Just emit; no subtlety */ - emit_video (earliest_piece, dv); - step_video_position (dv); - - } else if (dv->dcp_time > _video_position) { - - /* Too far ahead */ - - list >::iterator i = _pieces.begin(); - while (i != _pieces.end() && ((*i)->content->position() >= _video_position || _video_position >= (*i)->content->end())) { - ++i; - } - - if (i == _pieces.end() || !_last_incoming_video.video || !_have_valid_pieces) { - /* We're outside all video content */ - emit_black (); - _statistics.video.black++; - } else { - /* We're inside some video; repeat the frame */ - _last_incoming_video.video->dcp_time = _video_position; - emit_video (_last_incoming_video.weak_piece, _last_incoming_video.video); - step_video_position (_last_incoming_video.video); - _statistics.video.repeat++; - } - - consume = false; - - } else if (dv->dcp_time == _video_position) { - /* We're ok */ - emit_video (earliest_piece, dv); - step_video_position (dv); - _statistics.video.good++; - } else { - /* Too far behind: skip */ - _statistics.video.skip++; - } - - _just_did_inaccurate_seek = false; - - } else if (da && _audio) { - - if (da->dcp_time > _audio_position) { - /* Too far ahead */ - emit_silence (da->dcp_time - _audio_position); - consume = false; - _statistics.audio.silence += (da->dcp_time - _audio_position); - } else if (da->dcp_time == _audio_position) { - /* We're ok */ - emit_audio (earliest_piece, da); - _statistics.audio.good += da->data->frames(); - } else { - /* Too far behind: skip */ - _statistics.audio.skip += da->data->frames(); - } - - } else if (dis && _video) { - _image_subtitle.piece = earliest_piece; - _image_subtitle.subtitle = dis; - update_subtitle_from_image (); - } else if (dts && _video) { - _text_subtitle.piece = earliest_piece; - _text_subtitle.subtitle = dts; - update_subtitle_from_text (); - } - - if (consume) { - earliest_piece->decoder->consume (); - } - - return false; -} - -void -Player::emit_video (weak_ptr weak_piece, shared_ptr video) -{ - /* Keep a note of what came in so that we can repeat it if required */ - _last_incoming_video.weak_piece = weak_piece; - _last_incoming_video.video = video; - - shared_ptr piece = weak_piece.lock (); - if (!piece) { - return; - } - - shared_ptr content = dynamic_pointer_cast (piece->content); - assert (content); - - FrameRateChange frc (content->video_frame_rate(), _film->video_frame_rate()); - - dcp::Size image_size = content->scale().size (content, _video_container_size); - if (_approximate_size) { - image_size.width &= ~3; - image_size.height &= ~3; - } - - shared_ptr pi ( - new PlayerImage ( - video->image, - content->crop(), - image_size, - _video_container_size, - _film->scaler() - ) - ); - - if ( - _film->with_subtitles () && - _out_subtitle.image && - video->dcp_time >= _out_subtitle.from && video->dcp_time <= _out_subtitle.to - ) { - - Position const container_offset ( - (_video_container_size.width - image_size.width) / 2, - (_video_container_size.height - image_size.height) / 2 - ); - - pi->set_subtitle (_out_subtitle.image, _out_subtitle.position + container_offset); - } - - -#ifdef DCPOMATIC_DEBUG - _last_video = piece->content; -#endif - - Video (pi, video->eyes, content->colour_conversion(), video->same, video->dcp_time); - - _last_emit_was_black = false; -} - -void -Player::step_video_position (shared_ptr video) -{ - /* This is a bit of a hack; don't update _video_position if EYES_RIGHT is on its way */ - if (video->eyes != EYES_LEFT) { - /* This assumes that the video-frames-to-time conversion is exact - so that there are no accumulated errors caused by rounding. - */ - _video_position += DCPTime::from_frames (1, _film->video_frame_rate ()); - } -} - -void -Player::emit_audio (weak_ptr weak_piece, shared_ptr audio) -{ - shared_ptr piece = weak_piece.lock (); - if (!piece) { - return; - } - - shared_ptr content = dynamic_pointer_cast (piece->content); - assert (content); - - /* Gain */ - if (content->audio_gain() != 0) { - shared_ptr gain (new AudioBuffers (audio->data)); - gain->apply_gain (content->audio_gain ()); - audio->data = gain; - } - - /* Remap channels */ - shared_ptr dcp_mapped (new AudioBuffers (_film->audio_channels(), audio->data->frames())); - dcp_mapped->make_silent (); - AudioMapping map = content->audio_mapping (); - for (int i = 0; i < map.content_channels(); ++i) { - for (int j = 0; j < _film->audio_channels(); ++j) { - if (map.get (i, static_cast (j)) > 0) { - dcp_mapped->accumulate_channel ( - audio->data.get(), - i, - static_cast (j), - map.get (i, static_cast (j)) - ); - } - } - } - - audio->data = dcp_mapped; - - /* Delay */ - audio->dcp_time += DCPTime::from_seconds (content->audio_delay() / 1000.0); - if (audio->dcp_time < DCPTime (0)) { - int const frames = - audio->dcp_time.frames (_film->audio_frame_rate()); - if (frames >= audio->data->frames ()) { - return; - } - - shared_ptr trimmed (new AudioBuffers (audio->data->channels(), audio->data->frames() - frames)); - trimmed->copy_from (audio->data.get(), audio->data->frames() - frames, frames, 0); - - audio->data = trimmed; - audio->dcp_time = DCPTime (); - } - - _audio_merger.push (audio->data, audio->dcp_time); -} - -void -Player::flush () -{ - TimedAudioBuffers tb = _audio_merger.flush (); - if (_audio && tb.audio) { - Audio (tb.audio, tb.time); - _audio_position += DCPTime::from_frames (tb.audio->frames (), _film->audio_frame_rate ()); - } - - while (_video && _video_position < _audio_position) { - emit_black (); - } - - while (_audio && _audio_position < _video_position) { - emit_silence (_video_position - _audio_position); - } -} - -/** Seek so that the next pass() will yield (approximately) the requested frame. - * Pass accurate = true to try harder to get close to the request. - * @return true on error - */ -void -Player::seek (DCPTime t, bool accurate) -{ - if (!_have_valid_pieces) { - setup_pieces (); - } - - if (_pieces.empty ()) { - return; - } - - for (list >::iterator i = _pieces.begin(); i != _pieces.end(); ++i) { - /* s is the offset of t from the start position of this content */ - DCPTime s = t - (*i)->content->position (); - s = max (static_cast (0), s); - s = min ((*i)->content->length_after_trim(), s); - - /* Convert this to the content time */ - ContentTime ct (s + (*i)->content->trim_start(), (*i)->frc); - - /* And seek the decoder */ - (*i)->decoder->seek (ct, accurate); - } - - _video_position = t.round_up (_film->video_frame_rate()); - _audio_position = t.round_up (_film->audio_frame_rate()); - - _audio_merger.clear (_audio_position); - - if (!accurate) { - /* We just did an inaccurate seek, so it's likely that the next thing seen - out of pass() will be a fair distance from _{video,audio}_position. Setting - this flag stops pass() from trying to fix that: we assume that if it - was an inaccurate seek then the caller does not care too much about - inserting black/silence to keep the time tidy. - */ - _just_did_inaccurate_seek = true; - } -} - void Player::setup_pieces () { @@ -486,7 +113,7 @@ Player::setup_pieces () /* FFmpeg */ shared_ptr fc = dynamic_pointer_cast (*i); if (fc) { - decoder.reset (new FFmpegDecoder (fc, _film->log(), _video, _audio, _film->with_subtitles ())); + decoder.reset (new FFmpegDecoder (fc, _film->log())); frc = FrameRateChange (fc->video_frame_rate(), _film->video_frame_rate()); } @@ -522,19 +149,10 @@ Player::setup_pieces () frc = best_overlap_frc; } - ContentTime st ((*i)->trim_start(), frc.get ()); - decoder->seek (st, true); - _pieces.push_back (shared_ptr (new Piece (*i, decoder, frc.get ()))); } _have_valid_pieces = true; - - /* The Piece for the _last_incoming_video will no longer be valid */ - _last_incoming_video.video.reset (); - - _video_position = DCPTime (); - _audio_position = DCPTime (); } void @@ -546,9 +164,12 @@ Player::content_changed (weak_ptr w, int property, bool frequent) } if ( - property == ContentProperty::POSITION || property == ContentProperty::LENGTH || - property == ContentProperty::TRIM_START || property == ContentProperty::TRIM_END || - property == VideoContentProperty::VIDEO_FRAME_TYPE + property == ContentProperty::POSITION || + property == ContentProperty::LENGTH || + property == ContentProperty::TRIM_START || + property == ContentProperty::TRIM_END || + property == ContentProperty::PATH || + property == VideoContentProperty::VIDEO_FRAME_TYPE ) { _have_valid_pieces = false; @@ -557,24 +178,13 @@ Player::content_changed (weak_ptr w, int property, bool frequent) } else if ( property == SubtitleContentProperty::SUBTITLE_X_OFFSET || property == SubtitleContentProperty::SUBTITLE_Y_OFFSET || - property == SubtitleContentProperty::SUBTITLE_SCALE - ) { - - update_subtitle_from_image (); - update_subtitle_from_text (); - Changed (frequent); - - } else if ( - property == VideoContentProperty::VIDEO_CROP || property == VideoContentProperty::VIDEO_SCALE || + property == SubtitleContentProperty::SUBTITLE_SCALE || + property == VideoContentProperty::VIDEO_CROP || + property == VideoContentProperty::VIDEO_SCALE || property == VideoContentProperty::VIDEO_FRAME_RATE ) { Changed (frequent); - - } else if (property == ContentProperty::PATH) { - - _have_valid_pieces = false; - Changed (frequent); } } @@ -590,45 +200,8 @@ Player::set_video_container_size (dcp::Size s) { _video_container_size = s; - shared_ptr im (new Image (PIX_FMT_RGB24, _video_container_size, true)); - im->make_black (); - - _black_frame.reset ( - new PlayerImage ( - im, - Crop(), - _video_container_size, - _video_container_size, - Scaler::from_id ("bicubic") - ) - ); -} - -void -Player::emit_black () -{ -#ifdef DCPOMATIC_DEBUG - _last_video.reset (); -#endif - - Video (_black_frame, EYES_BOTH, ColourConversion(), _last_emit_was_black, _video_position); - _video_position += DCPTime::from_frames (1, _film->video_frame_rate ()); - _last_emit_was_black = true; -} - -void -Player::emit_silence (DCPTime most) -{ - if (most == DCPTime ()) { - return; - } - - DCPTime t = min (most, DCPTime::from_seconds (0.5)); - shared_ptr silence (new AudioBuffers (_film->audio_channels(), t.frames (_film->audio_frame_rate()))); - silence->make_silent (); - Audio (silence, _audio_position); - - _audio_position += t; + _black_image.reset (new Image (PIX_FMT_RGB24, _video_container_size, true)); + _black_image->make_black (); } void @@ -644,128 +217,278 @@ Player::film_changed (Film::Property p) } } -void -Player::update_subtitle_from_image () +list +Player::process_content_image_subtitles (shared_ptr content, list > subs) { - shared_ptr piece = _image_subtitle.piece.lock (); - if (!piece) { - return; - } + list all; + + for (list >::const_iterator i = subs.begin(); i != subs.end(); ++i) { + if (!(*i)->image) { + continue; + } - if (!_image_subtitle.subtitle->image) { - _out_subtitle.image.reset (); - return; + dcpomatic::Rect in_rect = (*i)->rectangle; + dcp::Size scaled_size; + + in_rect.x += content->subtitle_x_offset (); + in_rect.y += content->subtitle_y_offset (); + + /* We will scale the subtitle up to fit _video_container_size, and also by the additional subtitle_scale */ + scaled_size.width = in_rect.width * _video_container_size.width * content->subtitle_scale (); + scaled_size.height = in_rect.height * _video_container_size.height * content->subtitle_scale (); + + /* Then we need a corrective translation, consisting of two parts: + * + * 1. that which is the result of the scaling of the subtitle by _video_container_size; this will be + * rect.x * _video_container_size.width and rect.y * _video_container_size.height. + * + * 2. that to shift the origin of the scale by subtitle_scale to the centre of the subtitle; this will be + * (width_before_subtitle_scale * (1 - subtitle_scale) / 2) and + * (height_before_subtitle_scale * (1 - subtitle_scale) / 2). + * + * Combining these two translations gives these expressions. + */ + + all.push_back ( + PositionImage ( + (*i)->image->scale ( + scaled_size, + Scaler::from_id ("bicubic"), + (*i)->image->pixel_format (), + true + ), + Position ( + rint (_video_container_size.width * (in_rect.x + (in_rect.width * (1 - content->subtitle_scale ()) / 2))), + rint (_video_container_size.height * (in_rect.y + (in_rect.height * (1 - content->subtitle_scale ()) / 2))) + ) + ) + ); } - shared_ptr sc = dynamic_pointer_cast (piece->content); - assert (sc); - - dcpomatic::Rect in_rect = _image_subtitle.subtitle->rect; - dcp::Size scaled_size; - - in_rect.x += sc->subtitle_x_offset (); - in_rect.y += sc->subtitle_y_offset (); - - /* We will scale the subtitle up to fit _video_container_size, and also by the additional subtitle_scale */ - scaled_size.width = in_rect.width * _video_container_size.width * sc->subtitle_scale (); - scaled_size.height = in_rect.height * _video_container_size.height * sc->subtitle_scale (); - - /* Then we need a corrective translation, consisting of two parts: - * - * 1. that which is the result of the scaling of the subtitle by _video_container_size; this will be - * rect.x * _video_container_size.width and rect.y * _video_container_size.height. - * - * 2. that to shift the origin of the scale by subtitle_scale to the centre of the subtitle; this will be - * (width_before_subtitle_scale * (1 - subtitle_scale) / 2) and - * (height_before_subtitle_scale * (1 - subtitle_scale) / 2). - * - * Combining these two translations gives these expressions. - */ - - _out_subtitle.position.x = rint (_video_container_size.width * (in_rect.x + (in_rect.width * (1 - sc->subtitle_scale ()) / 2))); - _out_subtitle.position.y = rint (_video_container_size.height * (in_rect.y + (in_rect.height * (1 - sc->subtitle_scale ()) / 2))); - - _out_subtitle.image = _image_subtitle.subtitle->image->scale ( - scaled_size, - Scaler::from_id ("bicubic"), - _image_subtitle.subtitle->image->pixel_format (), - true - ); - - _out_subtitle.from = _image_subtitle.subtitle->dcp_time + piece->content->position (); - _out_subtitle.to = _image_subtitle.subtitle->dcp_time_to + piece->content->position (); + return all; } -/** Re-emit the last frame that was emitted, using current settings for crop, ratio, scaler and subtitles. - * @return false if this could not be done. - */ -bool -Player::repeat_last_video () +list +Player::process_content_text_subtitles (list > sub) { - if (!_last_incoming_video.video || !_have_valid_pieces) { - return false; + list all; + for (list >::const_iterator i = sub.begin(); i != sub.end(); ++i) { + if (!(*i)->subs.empty ()) { + all.push_back (render_subtitles ((*i)->subs, _video_container_size)); + } } - emit_video ( - _last_incoming_video.weak_piece, - _last_incoming_video.video - ); - - return true; + return all; } void -Player::update_subtitle_from_text () +Player::set_approximate_size () { - if (_text_subtitle.subtitle->subs.empty ()) { - _out_subtitle.image.reset (); - return; + _approximate_size = true; +} + +shared_ptr +Player::get_video (DCPTime time, bool accurate) +{ + if (!_have_valid_pieces) { + setup_pieces (); + } + + list > ov = overlaps (time); + if (ov.empty ()) { + /* No video content at this time: return a black frame */ + return shared_ptr ( + new DCPVideo ( + _black_image, + EYES_BOTH, + Crop (), + _video_container_size, + _video_container_size, + Scaler::from_id ("bicubic"), + Config::instance()->colour_conversions().front().conversion, + time + ) + ); + } + + /* Create a DCPVideo from the content's video at this time */ + + shared_ptr piece = ov.back (); + shared_ptr decoder = dynamic_pointer_cast (piece->decoder); + assert (decoder); + shared_ptr content = dynamic_pointer_cast (piece->content); + assert (content); + + optional dec = decoder->get_video (dcp_to_content_video (piece, time), accurate); + assert (dec); + + dcp::Size image_size = content->scale().size (content, _video_container_size, _film->frame_size ()); + if (_approximate_size) { + image_size.width &= ~3; + image_size.height &= ~3; + } + + shared_ptr dcp_video ( + new DCPVideo ( + dec->image, + dec->eyes, + content->crop (), + image_size, + _video_container_size, + _film->scaler(), + content->colour_conversion (), + time + ) + ); + + /* Add subtitles */ + + ov = overlaps (time); + list sub_images; + + for (list >::const_iterator i = ov.begin(); i != ov.end(); ++i) { + shared_ptr subtitle_decoder = dynamic_pointer_cast ((*i)->decoder); + shared_ptr subtitle_content = dynamic_pointer_cast ((*i)->content); + ContentTime const from = dcp_to_content_subtitle (*i, time); + ContentTime const to = from + ContentTime::from_frames (1, content->video_frame_rate ()); + + list > image_subtitles = subtitle_decoder->get_image_subtitles (from, to); + if (!image_subtitles.empty ()) { + list im = process_content_image_subtitles ( + subtitle_content, + image_subtitles + ); + + copy (im.begin(), im.end(), back_inserter (sub_images)); + } + + if (_burn_subtitles) { + list > text_subtitles = subtitle_decoder->get_text_subtitles (from, to); + if (!text_subtitles.empty ()) { + list im = process_content_text_subtitles (text_subtitles); + copy (im.begin(), im.end(), back_inserter (sub_images)); + } + } } - render_subtitles (_text_subtitle.subtitle->subs, _video_container_size, _out_subtitle.image, _out_subtitle.position); + if (!sub_images.empty ()) { + dcp_video->set_subtitle (merge (sub_images)); + } + + return dcp_video; } -void -Player::set_approximate_size () +shared_ptr +Player::get_audio (DCPTime time, DCPTime length, bool accurate) { - _approximate_size = true; + if (!_have_valid_pieces) { + setup_pieces (); + } + + AudioFrame const length_frames = length.frames (_film->audio_frame_rate ()); + + shared_ptr audio (new AudioBuffers (_film->audio_channels(), length_frames)); + audio->make_silent (); + + list > ov = overlaps (time); + if (ov.empty ()) { + return audio; + } + + for (list >::iterator i = ov.begin(); i != ov.end(); ++i) { + + shared_ptr content = dynamic_pointer_cast ((*i)->content); + assert (content); + shared_ptr decoder = dynamic_pointer_cast ((*i)->decoder); + assert (decoder); + + AudioFrame const content_time = dcp_to_content_audio (*i, time); + + /* Audio from this piece's decoder (which might be more than what we asked for) */ + shared_ptr all = decoder->get_audio (content_time, length_frames, accurate); + + /* Gain */ + if (content->audio_gain() != 0) { + shared_ptr gain (new AudioBuffers (all->audio)); + gain->apply_gain (content->audio_gain ()); + all->audio = gain; + } + + /* Remap channels */ + shared_ptr dcp_mapped (new AudioBuffers (_film->audio_channels(), all->audio->frames())); + dcp_mapped->make_silent (); + AudioMapping map = content->audio_mapping (); + for (int i = 0; i < map.content_channels(); ++i) { + for (int j = 0; j < _film->audio_channels(); ++j) { + if (map.get (i, static_cast (j)) > 0) { + dcp_mapped->accumulate_channel ( + all->audio.get(), + i, + j, + map.get (i, static_cast (j)) + ); + } + } + } + + all->audio = dcp_mapped; + + /* Delay */ + /* XXX + audio->dcp_time += content->audio_delay() * TIME_HZ / 1000; + if (audio->dcp_time < 0) { + int const frames = - audio->dcp_time * _film->audio_frame_rate() / TIME_HZ; + if (frames >= audio->audio->frames ()) { + return; + } + + shared_ptr trimmed (new AudioBuffers (audio->audio->channels(), audio->audio->frames() - frames)); + trimmed->copy_from (audio->audio.get(), audio->audio->frames() - frames, frames, 0); + + audio->audio = trimmed; + audio->dcp_time = 0; + } + */ + + audio->accumulate_frames (all->audio.get(), all->frame - content_time, 0, min (AudioFrame (all->audio->frames()), length_frames)); + } + + return audio; } - -PlayerImage::PlayerImage ( - shared_ptr in, - Crop crop, - dcp::Size inter_size, - dcp::Size out_size, - Scaler const * scaler - ) - : _in (in) - , _crop (crop) - , _inter_size (inter_size) - , _out_size (out_size) - , _scaler (scaler) + +VideoFrame +Player::dcp_to_content_video (shared_ptr piece, DCPTime t) const { + /* s is the offset of t from the start position of this content */ + DCPTime s = t - piece->content->position (); + s = DCPTime (max (int64_t (0), s.get ())); + s = DCPTime (min (piece->content->length_after_trim().get(), s.get())); + /* Convert this to the content frame */ + return DCPTime (s + piece->content->trim_start()).frames (_film->video_frame_rate()) * piece->frc.factor (); } -void -PlayerImage::set_subtitle (shared_ptr image, Position pos) +AudioFrame +Player::dcp_to_content_audio (shared_ptr piece, DCPTime t) const { - _subtitle_image = image; - _subtitle_position = pos; + /* s is the offset of t from the start position of this content */ + DCPTime s = t - piece->content->position (); + s = DCPTime (max (int64_t (0), s.get ())); + s = DCPTime (min (piece->content->length_after_trim().get(), s.get())); + + /* Convert this to the content frame */ + return DCPTime (s + piece->content->trim_start()).frames (_film->audio_frame_rate()); } -shared_ptr -PlayerImage::image (AVPixelFormat format, bool aligned) +ContentTime +Player::dcp_to_content_subtitle (shared_ptr piece, DCPTime t) const { - shared_ptr out = _in->crop_scale_window (_crop, _inter_size, _out_size, _scaler, format, aligned); - - Position const container_offset ((_out_size.width - _inter_size.width) / 2, (_out_size.height - _inter_size.width) / 2); - - if (_subtitle_image) { - out->alpha_blend (_subtitle_image, _subtitle_position); - } + /* s is the offset of t from the start position of this content */ + DCPTime s = t - piece->content->position (); + s = DCPTime (max (int64_t (0), s.get ())); + s = DCPTime (min (piece->content->length_after_trim().get(), s.get())); - return out; + return ContentTime (s, piece->frc); } void