From 645936f18657c8d5c275cbf3443974784304d672 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 21 Jan 2022 21:53:54 +0100 Subject: [PATCH] Rename _last_video* to _next_video* as it seems to make more sense that way. --- src/lib/player.cc | 56 +++++++++++++++++++++++------------------------ src/lib/player.h | 11 +++++----- 2 files changed, 34 insertions(+), 33 deletions(-) diff --git a/src/lib/player.cc b/src/lib/player.cc index 25f4131be..4e586ed77 100644 --- a/src/lib/player.cc +++ b/src/lib/player.cc @@ -278,9 +278,9 @@ Player::setup_pieces_unlocked () _black = Empty (_film, playlist(), bind(&have_video, _1), _playback_length); _silent = Empty (_film, playlist(), bind(&have_audio, _1), _playback_length); - _last_video_time = boost::optional(); - _last_video_eyes = Eyes::BOTH; - _last_audio_time = boost::optional(); + _next_video_time = boost::optional(); + _next_video_eyes = Eyes::BOTH; + _next_audio_time = boost::optional(); } @@ -702,11 +702,11 @@ Player::pass () earliest_content->done = earliest_content->decoder->pass (); auto dcp = dynamic_pointer_cast(earliest_content->content); if (dcp && !_play_referenced && dcp->reference_audio()) { - /* We are skipping some referenced DCP audio content, so we need to update _last_audio_time + /* We are skipping some referenced DCP audio content, so we need to update _next_audio_time to `hide' the fact that no audio was emitted during the referenced DCP (though we need to behave as though it was). */ - _last_audio_time = dcp->end (_film); + _next_audio_time = dcp->end (_film); } break; } @@ -719,20 +719,20 @@ Player::pass () { LOG_DEBUG_PLAYER ("Emit silence for gap at %1", to_string(_silent.position())); DCPTimePeriod period (_silent.period_at_position()); - if (_last_audio_time) { + if (_next_audio_time) { /* Sometimes the thing that happened last finishes fractionally before or after this silence. Bodge the start time of the silence to fix it. I think this is nothing to worry about since we will just add or remove a little silence at the end of some content. */ - int64_t const error = labs(period.from.get() - _last_audio_time->get()); + int64_t const error = labs(period.from.get() - _next_audio_time->get()); /* Let's not worry about less than a frame at 24fps */ int64_t const too_much_error = DCPTime::from_frames(1, 24).get(); if (error >= too_much_error) { _film->log()->log(String::compose("Silence starting before or after last audio by %1", error), LogEntry::TYPE_ERROR); } DCPOMATIC_ASSERT (error < too_much_error); - period.from = *_last_audio_time; + period.from = *_next_audio_time; } if (period.duration() > one_video_frame()) { period.to = period.from + one_video_frame(); @@ -792,16 +792,16 @@ Player::pass () LOG_DEBUG_PLAYER("Emitting audio up to %1", to_string(pull_to)); auto audio = _audio_merger.pull (pull_to); for (auto i = audio.begin(); i != audio.end(); ++i) { - if (_last_audio_time && i->second < *_last_audio_time) { + if (_next_audio_time && i->second < *_next_audio_time) { /* This new data comes before the last we emitted (or the last seek); discard it */ - auto cut = discard_audio (i->first, i->second, *_last_audio_time); + auto cut = discard_audio (i->first, i->second, *_next_audio_time); if (!cut.first) { continue; } *i = cut; - } else if (_last_audio_time && i->second > *_last_audio_time) { + } else if (_next_audio_time && i->second > *_next_audio_time) { /* There's a gap between this data and the last we emitted; fill with silence */ - fill_audio (DCPTimePeriod (*_last_audio_time, i->second)); + fill_audio (DCPTimePeriod (*_next_audio_time, i->second)); } emit_audio (i->first, i->second); @@ -894,7 +894,7 @@ Player::video (weak_ptr wp, ContentVideo video) if it's after the content's period here as in that case we still need to fill any gap between `now' and the end of the content's period. */ - if (time < piece->content->position() || (_last_video_time && time < *_last_video_time)) { + if (time < piece->content->position() || (_next_video_time && time < *_next_video_time)) { return; } @@ -907,8 +907,8 @@ Player::video (weak_ptr wp, ContentVideo video) */ DCPTime fill_to = min (time, piece->content->end(_film)); - if (_last_video_time) { - DCPTime fill_from = max (*_last_video_time, piece->content->position()); + if (_next_video_time) { + DCPTime fill_from = max (*_next_video_time, piece->content->position()); /* Fill if we have more than half a frame to do */ if ((fill_to - fill_from) > one_video_frame() / 2) { @@ -923,7 +923,7 @@ Player::video (weak_ptr wp, ContentVideo video) fill_to_eyes = Eyes::LEFT; } auto j = fill_from; - auto eyes = _last_video_eyes.get_value_or(Eyes::LEFT); + auto eyes = _next_video_eyes.get_value_or(Eyes::LEFT); if (eyes == Eyes::BOTH) { eyes = Eyes::LEFT; } @@ -1234,13 +1234,13 @@ Player::seek (DCPTime time, bool accurate) } if (accurate) { - _last_video_time = time; - _last_video_eyes = Eyes::LEFT; - _last_audio_time = time; + _next_video_time = time; + _next_video_eyes = Eyes::LEFT; + _next_audio_time = time; } else { - _last_video_time = optional(); - _last_video_eyes = optional(); - _last_audio_time = optional(); + _next_video_time = optional(); + _next_video_eyes = optional(); + _next_audio_time = optional(); } _black.set_position (time); @@ -1269,9 +1269,9 @@ Player::emit_video (shared_ptr pv, DCPTime time) _delay.push_back (make_pair (pv, time)); if (pv->eyes() == Eyes::BOTH || pv->eyes() == Eyes::RIGHT) { - _last_video_time = time + one_video_frame(); + _next_video_time = time + one_video_frame(); } - _last_video_eyes = increment_eyes (pv->eyes()); + _next_video_eyes = increment_eyes (pv->eyes()); if (_delay.size() < 3) { return; @@ -1305,14 +1305,14 @@ void Player::emit_audio (shared_ptr data, DCPTime time) { /* Log if the assert below is about to fail */ - if (_last_audio_time && labs(time.get() - _last_audio_time->get()) > 1) { - _film->log()->log(String::compose("Out-of-sequence emit %1 vs %2", to_string(time), to_string(*_last_audio_time)), LogEntry::TYPE_WARNING); + if (_next_audio_time && labs(time.get() - _next_audio_time->get()) > 1) { + _film->log()->log(String::compose("Out-of-sequence emit %1 vs %2", to_string(time), to_string(*_next_audio_time)), LogEntry::TYPE_WARNING); } /* This audio must follow on from the previous, allowing for half a sample (at 48kHz) leeway */ - DCPOMATIC_ASSERT (!_last_audio_time || labs(time.get() - _last_audio_time->get()) < 2); + DCPOMATIC_ASSERT (!_next_audio_time || labs(time.get() - _next_audio_time->get()) < 2); Audio (data, time, _film->audio_frame_rate()); - _last_audio_time = time + DCPTime::from_frames (data->frames(), _film->audio_frame_rate()); + _next_audio_time = time + DCPTime::from_frames (data->frames(), _film->audio_frame_rate()); } diff --git a/src/lib/player.h b/src/lib/player.h index b74aeeefd..bedf51d8e 100644 --- a/src/lib/player.h +++ b/src/lib/player.h @@ -196,11 +196,12 @@ private: /** true if we should `play' (i.e output) referenced DCP data (e.g. for preview) */ bool _play_referenced = false; - /** Time just after the last video frame we emitted, or the time of the last accurate seek */ - boost::optional _last_video_time; - boost::optional _last_video_eyes; - /** Time just after the last audio frame we emitted, or the time of the last accurate seek */ - boost::optional _last_audio_time; + /** Time of the next video that we will emit, or the time of the last accurate seek */ + boost::optional _next_video_time; + /** Eyes of the next video that we will emit */ + boost::optional _next_video_eyes; + /** Time of the next audio that we will emit, or the time of the last accurate seek */ + boost::optional _next_audio_time; boost::optional _dcp_decode_reduction; -- 2.30.2