X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Faudio_decoder.cc;h=a5e86f22b8e352d529fa39e69149ad10cca9fec4;hp=8c395cb89a0074aa171c3eb06b39c6bc4c00d508;hb=8f12e84009d7c2685bb2eeb32665876463d4e6e5;hpb=3828baf56467224f5d44049bf1e7a7ed11f43a05 diff --git a/src/lib/audio_decoder.cc b/src/lib/audio_decoder.cc index 8c395cb89..a5e86f22b 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-2018 Carl Hetherington This file is part of DCP-o-matic. @@ -20,8 +20,11 @@ #include "audio_decoder.h" #include "audio_buffers.h" -#include "audio_decoder_stream.h" #include "audio_content.h" +#include "dcpomatic_log.h" +#include "log.h" +#include "resampler.h" +#include "compose.hpp" #include #include @@ -29,75 +32,136 @@ using std::cout; using std::map; +using std::pair; using boost::shared_ptr; +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) { + /* Set up _positions so that we have one for each stream */ BOOST_FOREACH (AudioStreamPtr i, content->streams ()) { - _streams[i] = shared_ptr (new AudioDecoderStream (content, i, parent, fast, log)); + _positions[i] = 0; } } -ContentAudio -AudioDecoder::get (AudioStreamPtr stream, Frame frame, Frame length, bool accurate) -{ - return _streams[stream]->get (frame, length, accurate); -} - void -AudioDecoder::give (AudioStreamPtr stream, shared_ptr data, ContentTime time) +AudioDecoder::emit (shared_ptr film, AudioStreamPtr stream, shared_ptr data, ContentTime time) { - if (_ignore) { + if (ignore ()) { return; } - if (_streams.find (stream) == _streams.end ()) { + 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). + */ + 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)); + } - /* 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. + shared_ptr resampler; + ResamplerMap::iterator i = _resamplers.find(stream); + if (i != _resamplers.end ()) { + resampler = i->second; + } else { + if (stream->frame_rate() != _content->resampled_frame_rate(film)) { + LOG_GENERAL ( + "Creating new resampler from %1 to %2 with %3 channels", + stream->frame_rate(), + _content->resampled_frame_rate(film), + stream->channels() + ); + + resampler.reset (new Resampler (stream->frame_rate(), _content->resampled_frame_rate(film), stream->channels())); + if (_fast) { + resampler->set_fast (); + } + _resamplers[stream] = resampler; + } + } - At this point the AudioDecoder does not know about the new stream. + if (resampler) { + shared_ptr ro = resampler->run (data); + if (ro->frames() == 0) { + return; + } + data = ro; + } - Then - - Some other property change signal is delivered which marks the player's pieces invalid. - - Film viewer re-gets again. - - Everything is OK. + Data(stream, ContentAudio (data, _positions[stream])); + _positions[stream] += data->frames(); +} - In this situation it is fine for us to silently drop the audio. - */ +/** @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); + DCPOMATIC_ASSERT (i != _positions.end ()); + return ContentTime::from_frames (i->second, _content->resampled_frame_rate(film)); +} - return; +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); + 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) { + for (ResamplerMap::iterator i = _resamplers.begin(); i != _resamplers.end(); ++i) { i->second->flush (); + i->second->reset (); + } + + for (PositionMap::iterator i = _positions.begin(); i != _positions.end(); ++i) { + 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 (ResamplerMap::iterator i = _resamplers.begin(); i != _resamplers.end(); ++i) { + shared_ptr 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 */ + silence (-_content->delay ()); } } -/** Set this decoder never to produce any data */ void -AudioDecoder::set_ignore () +AudioDecoder::silence (int milliseconds) { - _ignore = true; + BOOST_FOREACH (AudioStreamPtr 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)); + silence->make_silent (); + Data (i, ContentAudio (silence, _positions[i])); + } }