X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fplayer.cc;h=59d046956d570d237870308246dd4bbbb4d336bf;hb=a79d78d8bb6d51f6662f1f63b9f8fd19e1a0c5f1;hp=cb6d519842c5c6cfce1ac92d5f1fe83f74a04e0c;hpb=015fe447cfe25babc55cf8ed282bb909e4713aa0;p=dcpomatic.git diff --git a/src/lib/player.cc b/src/lib/player.cc index cb6d51984..59d046956 100644 --- a/src/lib/player.cc +++ b/src/lib/player.cc @@ -22,6 +22,7 @@ #include "player.h" #include "film.h" #include "ffmpeg_decoder.h" +#include "audio_buffers.h" #include "ffmpeg_content.h" #include "image_decoder.h" #include "image_content.h" @@ -72,7 +73,7 @@ Player::Player (shared_ptr f, shared_ptr p) , _have_valid_pieces (false) , _video_position (0) , _audio_position (0) - , _audio_merger (f->audio_channels(), bind (&Film::time_to_audio_frames, f.get(), _1), bind (&Film::audio_frames_to_time, f.get(), _1)) + , _audio_merger (f->audio_channels(), f->audio_frame_rate ()) , _last_emit_was_black (false) , _just_did_inaccurate_seek (false) , _approximate_size (false) @@ -106,8 +107,8 @@ Player::pass () shared_ptr earliest_piece; shared_ptr earliest_decoded; - DCPTime earliest_time = TIME_MAX; - DCPTime earliest_audio = TIME_MAX; + DCPTime earliest_time = DCPTime::max (); + DCPTime earliest_audio = DCPTime::max (); for (list >::iterator i = _pieces.begin(); i != _pieces.end(); ++i) { @@ -122,8 +123,10 @@ Player::pass () break; } - dec->set_dcp_times (_film->video_frame_rate(), _film->audio_frame_rate(), (*i)->frc, offset); + + dec->set_dcp_times ((*i)->frc, offset); DCPTime const t = dec->dcp_time - offset; + cout << "Peeked " << (*i)->content->paths()[0] << " for " << t << " cf " << ((*i)->content->full_length() - (*i)->content->trim_end ()) << "\n"; if (t >= ((*i)->content->full_length() - (*i)->content->trim_end ())) { /* In the end-trimmed part; decoder has nothing else to give us */ dec.reset (); @@ -157,13 +160,16 @@ Player::pass () return true; } - if (earliest_audio != TIME_MAX) { - TimedAudioBuffers tb = _audio_merger.pull (max (int64_t (0), earliest_audio)); + 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 + /* This assumes that the audio-frames-to-time conversion is exact so that there are no accumulated errors caused by rounding. */ - _audio_position += _film->audio_frames_to_time (tb.audio->frames ()); + _audio_position += DCPTime::from_frames (tb.audio->frames(), _film->audio_frame_rate ()); } /* Emit the earliest thing */ @@ -269,8 +275,7 @@ Player::emit_video (weak_ptr weak_piece, shared_ptr video) FrameRateChange frc (content->video_frame_rate(), _film->video_frame_rate()); - float const ratio = content->ratio() ? content->ratio()->ratio() : content->video_size_after_crop().ratio(); - libdcp::Size image_size = fit_ratio_within (ratio, _video_container_size); + dcp::Size const image_size = content->scale().size (content, _video_container_size); if (_approximate_size) { image_size.width &= ~3; image_size.height &= ~3; @@ -315,10 +320,10 @@ 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 + /* This assumes that the video-frames-to-time conversion is exact so that there are no accumulated errors caused by rounding. */ - _video_position += _film->video_frames_to_time (1); + _video_position += DCPTime::from_frames (1, _film->video_frame_rate ()); } } @@ -346,12 +351,12 @@ Player::emit_audio (weak_ptr weak_piece, shared_ptr audio) 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) { + 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)) + static_cast (j), + map.get (i, static_cast (j)) ); } } @@ -360,9 +365,9 @@ Player::emit_audio (weak_ptr weak_piece, shared_ptr audio) audio->data = dcp_mapped; /* Delay */ - 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; + 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; } @@ -371,7 +376,7 @@ Player::emit_audio (weak_ptr weak_piece, shared_ptr audio) trimmed->copy_from (audio->data.get(), audio->data->frames() - frames, frames, 0); audio->data = trimmed; - audio->dcp_time = 0; + audio->dcp_time = DCPTime (); } _audio_merger.push (audio->data, audio->dcp_time); @@ -383,7 +388,7 @@ Player::flush () TimedAudioBuffers tb = _audio_merger.flush (); if (_audio && tb.audio) { Audio (tb.audio, tb.time); - _audio_position += _film->audio_frames_to_time (tb.audio->frames ()); + _audio_position += DCPTime::from_frames (tb.audio->frames (), _film->audio_frame_rate ()); } while (_video && _video_position < _audio_position) { @@ -393,7 +398,6 @@ Player::flush () while (_audio && _audio_position < _video_position) { emit_silence (_video_position - _audio_position); } - } /** Seek so that the next pass() will yield (approximately) the requested frame. @@ -418,14 +422,14 @@ Player::seek (DCPTime t, bool accurate) s = min ((*i)->content->length_after_trim(), s); /* Convert this to the content time */ - ContentTime ct = (s + (*i)->content->trim_start()) * (*i)->frc.speed_up; + ContentTime ct (s + (*i)->content->trim_start(), (*i)->frc); /* And seek the decoder */ (*i)->decoder->seek (ct, accurate); } - _video_position = time_round_up (t, TIME_HZ / _film->video_frame_rate()); - _audio_position = time_round_up (t, TIME_HZ / _film->audio_frame_rate()); + _video_position = t.round_up (_film->video_frame_rate()); + _audio_position = t.round_up (_film->audio_frame_rate()); _audio_merger.clear (_audio_position); @@ -450,11 +454,15 @@ Player::setup_pieces () for (ContentList::iterator i = content.begin(); i != content.end(); ++i) { + if (!(*i)->paths_valid ()) { + continue; + } + shared_ptr decoder; optional frc; /* Work out a FrameRateChange for the best overlap video for this content, in case we need it below */ - DCPTime best_overlap_t = 0; + DCPTime best_overlap_t; shared_ptr best_overlap; for (ContentList::iterator j = content.begin(); j != content.end(); ++j) { shared_ptr vc = dynamic_pointer_cast (*j); @@ -516,7 +524,7 @@ Player::setup_pieces () frc = best_overlap_frc; } - ContentTime st = (*i)->trim_start() * frc->speed_up; + ContentTime st ((*i)->trim_start(), frc.get ()); decoder->seek (st, true); _pieces.push_back (shared_ptr (new Piece (*i, decoder, frc.get ()))); @@ -527,7 +535,8 @@ Player::setup_pieces () /* The Piece for the _last_incoming_video will no longer be valid */ _last_incoming_video.video.reset (); - _video_position = _audio_position = 0; + _video_position = DCPTime (); + _audio_position = DCPTime (); } void @@ -547,14 +556,18 @@ Player::content_changed (weak_ptr w, int property, bool frequent) _have_valid_pieces = false; Changed (frequent); - } else if (property == SubtitleContentProperty::SUBTITLE_OFFSET || property == SubtitleContentProperty::SUBTITLE_SCALE) { + } 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_RATIO || + property == VideoContentProperty::VIDEO_CROP || property == VideoContentProperty::VIDEO_SCALE || property == VideoContentProperty::VIDEO_FRAME_RATE ) { @@ -562,6 +575,7 @@ Player::content_changed (weak_ptr w, int property, bool frequent) } else if (property == ContentProperty::PATH) { + _have_valid_pieces = false; Changed (frequent); } } @@ -574,7 +588,7 @@ Player::playlist_changed () } void -Player::set_video_container_size (libdcp::Size s) +Player::set_video_container_size (dcp::Size s) { _video_container_size = s; @@ -600,7 +614,7 @@ Player::emit_black () #endif Video (_black_frame, EYES_BOTH, ColourConversion(), _last_emit_was_black, _video_position); - _video_position += _film->video_frames_to_time (1); + _video_position += DCPTime::from_frames (1, _film->video_frame_rate ()); _last_emit_was_black = true; } @@ -611,8 +625,8 @@ Player::emit_silence (DCPTime most) return; } - DCPTime t = min (most, TIME_HZ / 2); - shared_ptr silence (new AudioBuffers (_film->audio_channels(), t * _film->audio_frame_rate() / TIME_HZ)); + 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); @@ -649,9 +663,10 @@ Player::update_subtitle_from_image () assert (sc); dcpomatic::Rect in_rect = _image_subtitle.subtitle->rect; - libdcp::Size scaled_size; + dcp::Size scaled_size; - in_rect.y += sc->subtitle_offset (); + 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 (); @@ -679,8 +694,8 @@ Player::update_subtitle_from_image () true ); - _out_subtitle.from = _image_subtitle.subtitle->dcp_time; - _out_subtitle.to = _image_subtitle.subtitle->dcp_time_to; + _out_subtitle.from = _image_subtitle.subtitle->dcp_time + piece->content->position (); + _out_subtitle.to = _image_subtitle.subtitle->dcp_time_to + piece->content->position (); } /** Re-emit the last frame that was emitted, using current settings for crop, ratio, scaler and subtitles. @@ -721,8 +736,8 @@ Player::set_approximate_size () PlayerImage::PlayerImage ( shared_ptr in, Crop crop, - libdcp::Size inter_size, - libdcp::Size out_size, + dcp::Size inter_size, + dcp::Size out_size, Scaler const * scaler ) : _in (in)