X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Faudio_decoder.cc;h=77c9b0695a3d7b6f4c7d3b57df84193e017863eb;hb=89952bc64f5ae1b075b653f8a9daa02fd8d90260;hp=95b3a130db0287819cfe623656adbc7eb08a8a8c;hpb=254b3044d72de6b033d7c584f5abd2b9aa70aad5;p=dcpomatic.git diff --git a/src/lib/audio_decoder.cc b/src/lib/audio_decoder.cc index 95b3a130d..77c9b0695 100644 --- a/src/lib/audio_decoder.cc +++ b/src/lib/audio_decoder.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2018 Carl Hetherington + Copyright (C) 2012-2021 Carl Hetherington This file is part of DCP-o-matic. @@ -18,24 +18,27 @@ */ + #include "audio_decoder.h" #include "audio_buffers.h" #include "audio_content.h" +#include "dcpomatic_log.h" #include "log.h" #include "resampler.h" #include "compose.hpp" -#include #include #include "i18n.h" -#define LOG_GENERAL(...) dcpomatic_log->log (String::compose(__VA_ARGS__), LogEntry::TYPE_GENERAL); using std::cout; using std::map; using std::pair; -using boost::shared_ptr; +using std::shared_ptr; +using std::make_shared; using boost::optional; +using namespace dcpomatic; + AudioDecoder::AudioDecoder (Decoder* parent, shared_ptr content, bool fast) : DecoderPart (parent) @@ -43,46 +46,73 @@ AudioDecoder::AudioDecoder (Decoder* parent, shared_ptr cont , _fast (fast) { /* Set up _positions so that we have one for each stream */ - BOOST_FOREACH (AudioStreamPtr i, content->streams ()) { + for (auto i: content->streams ()) { _positions[i] = 0; } } + +/** @param time_already_delayed true if the delay should not be added to time */ void -AudioDecoder::emit (shared_ptr film, AudioStreamPtr stream, shared_ptr data, ContentTime time) +AudioDecoder::emit (shared_ptr film, AudioStreamPtr stream, shared_ptr data, ContentTime time, bool time_already_delayed) { if (ignore ()) { return; } + /* Amount of error we will tolerate on audio timestamps; see comment below. + * We'll use 1 24fps video frame at 48kHz as this seems to be roughly how + * ffplay does it. + */ + static Frame const slack_frames = 48000 / 24; + + int const resampled_rate = _content->resampled_frame_rate(film); + if (!time_already_delayed) { + time += ContentTime::from_seconds (_content->delay() / 1000.0); + } + + auto reset = false; if (_positions[stream] == 0) { /* This is the first data we have received since initialisation or seek. Set the position based on the ContentTime that was given. After this first time - we just count samples, as it seems that ContentTimes are unreliable from - FFmpegDecoder (not quite continuous; perhaps due to some rounding error). + we just count samples unless the timestamp is more than slack_frames away + from where we think it should be. This is because ContentTimes seem to be + slightly unreliable from FFmpegDecoder (i.e. not sample accurate), but we still + need to obey them sometimes otherwise we get sync problems such as #1833. */ if (_content->delay() > 0) { /* Insert silence to give the delay */ silence (_content->delay ()); } - time += ContentTime::from_seconds (_content->delay() / 1000.0); - _positions[stream] = time.frames_round (_content->resampled_frame_rate(film)); + reset = true; + } else if (std::abs(_positions[stream] - time.frames_round(resampled_rate)) > slack_frames) { + reset = true; + LOG_GENERAL ( + "Reset audio position: was %1, new data at %2, slack: %3 frames", + _positions[stream], + time.frames_round(resampled_rate), + std::abs(_positions[stream] - time.frames_round(resampled_rate)) + ); + } + + if (reset) { + _positions[stream] = time.frames_round (resampled_rate); } shared_ptr resampler; - ResamplerMap::iterator i = _resamplers.find(stream); - if (i != _resamplers.end ()) { + auto i = _resamplers.find(stream); + if (i != _resamplers.end()) { resampler = i->second; } else { - if (stream->frame_rate() != _content->resampled_frame_rate(film)) { + if (stream->frame_rate() != resampled_rate) { LOG_GENERAL ( "Creating new resampler from %1 to %2 with %3 channels", stream->frame_rate(), - _content->resampled_frame_rate(film), + resampled_rate, stream->channels() ); - resampler.reset (new Resampler (stream->frame_rate(), _content->resampled_frame_rate(film), stream->channels())); + resampler = make_shared(stream->frame_rate(), resampled_rate, stream->channels()); if (_fast) { resampler->set_fast (); } @@ -91,7 +121,7 @@ AudioDecoder::emit (shared_ptr film, AudioStreamPtr stream, shared_p } if (resampler) { - shared_ptr ro = resampler->run (data); + auto ro = resampler->run (data); if (ro->frames() == 0) { return; } @@ -102,50 +132,54 @@ AudioDecoder::emit (shared_ptr film, AudioStreamPtr stream, shared_p _positions[stream] += data->frames(); } + /** @return Time just after the last thing that was emitted from a given stream */ ContentTime AudioDecoder::stream_position (shared_ptr film, AudioStreamPtr stream) const { - PositionMap::const_iterator i = _positions.find (stream); + auto i = _positions.find (stream); DCPOMATIC_ASSERT (i != _positions.end ()); return ContentTime::from_frames (i->second, _content->resampled_frame_rate(film)); } -ContentTime + +boost::optional AudioDecoder::position (shared_ptr film) const { optional p; - for (PositionMap::const_iterator i = _positions.begin(); i != _positions.end(); ++i) { - ContentTime const ct = stream_position (film, i->first); + for (auto i: _positions) { + auto const ct = stream_position (film, i.first); if (!p || ct < *p) { p = ct; } } - return p.get_value_or(ContentTime()); + return p; } + void AudioDecoder::seek () { - for (ResamplerMap::iterator i = _resamplers.begin(); i != _resamplers.end(); ++i) { - i->second->flush (); - i->second->reset (); + for (auto i: _resamplers) { + i.second->flush (); + i.second->reset (); } - for (PositionMap::iterator i = _positions.begin(); i != _positions.end(); ++i) { - i->second = 0; + for (auto& i: _positions) { + i.second = 0; } } + void AudioDecoder::flush () { - for (ResamplerMap::iterator i = _resamplers.begin(); i != _resamplers.end(); ++i) { - shared_ptr ro = i->second->flush (); + for (auto const& i: _resamplers) { + auto ro = i.second->flush (); if (ro->frames() > 0) { - Data (i->first, ContentAudio (ro, _positions[i->first])); - _positions[i->first] += ro->frames(); + Data (i.first, ContentAudio (ro, _positions[i.first])); + _positions[i.first] += ro->frames(); } } @@ -155,12 +189,13 @@ AudioDecoder::flush () } } + void AudioDecoder::silence (int milliseconds) { - BOOST_FOREACH (AudioStreamPtr i, _content->streams ()) { + for (auto i: _content->streams()) { int const samples = ContentTime::from_seconds(milliseconds / 1000.0).frames_round(i->frame_rate()); - shared_ptr silence (new AudioBuffers (i->channels(), samples)); + auto silence = make_shared(i->channels(), samples); silence->make_silent (); Data (i, ContentAudio (silence, _positions[i])); }