X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Faudio_decoder.cc;h=ca1faa0100492b5e76363cde68b0aa4dbed1e9ab;hb=182b9d2e2feb6545592868606aaf0f0146095481;hp=8c395cb89a0074aa171c3eb06b39c6bc4c00d508;hpb=3828baf56467224f5d44049bf1e7a7ed11f43a05;p=dcpomatic.git diff --git a/src/lib/audio_decoder.cc b/src/lib/audio_decoder.cc index 8c395cb89..ca1faa010 100644 --- a/src/lib/audio_decoder.cc +++ b/src/lib/audio_decoder.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2016 Carl Hetherington + Copyright (C) 2012-2021 Carl Hetherington This file is part of DCP-o-matic. @@ -18,86 +18,184 @@ */ + #include "audio_decoder.h" #include "audio_buffers.h" -#include "audio_decoder_stream.h" #include "audio_content.h" -#include +#include "dcpomatic_log.h" +#include "log.h" +#include "resampler.h" +#include "compose.hpp" #include #include "i18n.h" + using std::cout; -using std::map; -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, shared_ptr log) - : _ignore (false) + +AudioDecoder::AudioDecoder (Decoder* parent, shared_ptr content, bool fast) + : DecoderPart (parent) + , _content (content) , _fast (fast) { - BOOST_FOREACH (AudioStreamPtr i, content->streams ()) { - _streams[i] = shared_ptr (new AudioDecoderStream (content, i, parent, fast, log)); + /* Set up _positions so that we have one for each stream */ + for (auto i: content->streams ()) { + _positions[i] = 0; } } -ContentAudio -AudioDecoder::get (AudioStreamPtr stream, Frame frame, Frame length, bool accurate) -{ - return _streams[stream]->get (frame, length, accurate); -} +/** @param time_already_delayed true if the delay should not be added to time */ void -AudioDecoder::give (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) { + if (ignore ()) { return; } - if (_streams.find (stream) == _streams.end ()) { + int const resampled_rate = _content->resampled_frame_rate(film); + if (!time_already_delayed) { + time += ContentTime::from_seconds (_content->delay() / 1000.0); + } - /* This method can be called with an unknown stream during the following sequence: - - Add KDM to some DCP content. - - Content gets re-examined. - - SingleStreamAudioContent::take_from_audio_examiner creates a new stream. - - Some content property change signal is delivered so Player::Changed is emitted. - - Film viewer to re-gets the frame. - - Player calls DCPDecoder pass which calls this method on the new stream. + /* Amount of error we will tolerate on audio timestamps; see comment below. + * We'll use 1 24fps video frame as this seems to be roughly how ffplay does it. + */ + Frame const slack_frames = resampled_rate / 24; + + /* first_since_seek is set to true if this is the first data we have + received since initialisation or seek. We'll set the position based + on the ContentTime that was given. After this first time 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. + */ + + auto const first_since_seek = _positions[stream] == 0; + auto const need_reset = !first_since_seek && (std::abs(_positions[stream] - time.frames_round(resampled_rate)) > slack_frames); + + if (need_reset) { + 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)) + ); + } - At this point the AudioDecoder does not know about the new stream. + if (first_since_seek || need_reset) { + _positions[stream] = time.frames_round (resampled_rate); + } - Then - - Some other property change signal is delivered which marks the player's pieces invalid. - - Film viewer re-gets again. - - Everything is OK. + if (first_since_seek && _content->delay() > 0) { + silence (stream, _content->delay()); + } - In this situation it is fine for us to silently drop the audio. - */ + shared_ptr resampler; + auto i = _resamplers.find(stream); + if (i != _resamplers.end()) { + resampler = i->second; + } else { + if (stream->frame_rate() != resampled_rate) { + LOG_GENERAL ( + "Creating new resampler from %1 to %2 with %3 channels", + stream->frame_rate(), + resampled_rate, + stream->channels() + ); + + resampler = make_shared(stream->frame_rate(), resampled_rate, stream->channels()); + if (_fast) { + resampler->set_fast (); + } + _resamplers[stream] = resampler; + } + } - return; + if (resampler) { + auto ro = resampler->run (data); + if (ro->frames() == 0) { + return; + } + data = ro; + } + + Data(stream, ContentAudio (data, _positions[stream])); + _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 +{ + auto i = _positions.find (stream); + DCPOMATIC_ASSERT (i != _positions.end ()); + return ContentTime::from_frames (i->second, _content->resampled_frame_rate(film)); +} + + +boost::optional +AudioDecoder::position (shared_ptr film) const +{ + optional p; + for (auto i: _positions) { + auto const ct = stream_position (film, i.first); + if (!p || ct < *p) { + p = ct; + } } - _streams[stream]->audio (data, time); + return p; } + void -AudioDecoder::flush () +AudioDecoder::seek () { - for (map >::const_iterator i = _streams.begin(); i != _streams.end(); ++i) { - i->second->flush (); + for (auto i: _resamplers) { + i.second->flush (); + i.second->reset (); + } + + for (auto& i: _positions) { + i.second = 0; } } + void -AudioDecoder::seek (ContentTime t, bool accurate) +AudioDecoder::flush () { - for (map >::const_iterator i = _streams.begin(); i != _streams.end(); ++i) { - i->second->seek (t, accurate); + 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(); + } + } + + if (_content->delay() < 0) { + /* Finish off with the gap caused by the delay */ + for (auto stream: _content->streams()) { + silence (stream, -_content->delay()); + } } } -/** Set this decoder never to produce any data */ + void -AudioDecoder::set_ignore () +AudioDecoder::silence (AudioStreamPtr stream, int milliseconds) { - _ignore = true; + int const samples = ContentTime::from_seconds(milliseconds / 1000.0).frames_round(stream->frame_rate()); + auto silence = make_shared(stream->channels(), samples); + silence->make_silent (); + Data (stream, ContentAudio(silence, _positions[stream])); }