/*
- Copyright (C) 2012-2017 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-2018 Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
using boost::shared_ptr;
using boost::optional;
-AudioDecoder::AudioDecoder (Decoder* parent, shared_ptr<const AudioContent> content, shared_ptr<Log> log)
+AudioDecoder::AudioDecoder (Decoder* parent, shared_ptr<const AudioContent> content, shared_ptr<Log> log, bool fast)
: DecoderPart (parent, log)
, _content (content)
+ , _fast (fast)
{
/* Set up _positions so that we have one for each stream */
BOOST_FOREACH (AudioStreamPtr i, content->streams ()) {
we just count samples, as it seems that ContentTimes are unreliable from
FFmpegDecoder (not quite continuous; perhaps due to some rounding error).
*/
- _positions[stream] = time.frames_round (stream->frame_rate ());
+ 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 ());
}
shared_ptr<Resampler> resampler;
- map<AudioStreamPtr, shared_ptr<Resampler> >::iterator i = _resamplers.find(stream);
+ ResamplerMap::iterator i = _resamplers.find(stream);
if (i != _resamplers.end ()) {
resampler = i->second;
} else {
);
resampler.reset (new Resampler (stream->frame_rate(), _content->resampled_frame_rate(), stream->channels()));
+ if (_fast) {
+ resampler->set_fast ();
+ }
_resamplers[stream] = resampler;
}
}
data = ro;
}
- Data (stream, ContentAudio (data, _positions[stream]));
+ 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 (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());
+}
+
ContentTime
AudioDecoder::position () const
{
optional<ContentTime> p;
- for (map<AudioStreamPtr, Frame>::const_iterator i = _positions.begin(); i != _positions.end(); ++i) {
- ContentTime const ct = ContentTime::from_frames (i->second, _content->resampled_frame_rate());
+ for (PositionMap::const_iterator i = _positions.begin(); i != _positions.end(); ++i) {
+ ContentTime const ct = stream_position (i->first);
if (!p || ct < *p) {
p = ct;
}
void
AudioDecoder::seek ()
{
- for (map<AudioStreamPtr, shared_ptr<Resampler> >::iterator i = _resamplers.begin(); i != _resamplers.end(); ++i) {
+ for (ResamplerMap::iterator i = _resamplers.begin(); i != _resamplers.end(); ++i) {
i->second->flush ();
i->second->reset ();
}
- for (map<AudioStreamPtr, Frame>::iterator i = _positions.begin(); i != _positions.end(); ++i) {
+ for (PositionMap::iterator i = _positions.begin(); i != _positions.end(); ++i) {
i->second = 0;
}
}
void
AudioDecoder::flush ()
{
- for (map<AudioStreamPtr, shared_ptr<Resampler> >::iterator i = _resamplers.begin(); i != _resamplers.end(); ++i) {
+ for (ResamplerMap::iterator i = _resamplers.begin(); i != _resamplers.end(); ++i) {
shared_ptr<const AudioBuffers> 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 ());
+ }
+}
+
+void
+AudioDecoder::silence (int milliseconds)
+{
+ BOOST_FOREACH (AudioStreamPtr i, _content->streams ()) {
+ int const samples = ContentTime::from_seconds(milliseconds / 1000.0).frames_round(i->frame_rate());
+ shared_ptr<AudioBuffers> silence (new AudioBuffers (i->channels(), samples));
+ silence->make_silent ();
+ Data (i, ContentAudio (silence, _positions[i]));
+ }
}