#include "log.h"
#include "audio_content.h"
#include "compose.hpp"
-#include <boost/make_shared.hpp>
#include <iostream>
#include "i18n.h"
using std::max;
using boost::optional;
using boost::shared_ptr;
-using boost::make_shared;
-AudioDecoderStream::AudioDecoderStream (shared_ptr<const AudioContent> content, AudioStreamPtr stream, Decoder* decoder, bool fast, shared_ptr<Log> log)
+AudioDecoderStream::AudioDecoderStream (shared_ptr<const AudioContent> content, AudioStreamPtr stream, Decoder* decoder, shared_ptr<Log> log)
: _content (content)
, _stream (stream)
, _decoder (decoder)
, _log (log)
{
if (content->resampled_frame_rate() != _stream->frame_rate() && _stream->channels() > 0) {
- _resampler.reset (new Resampler (_stream->frame_rate(), content->resampled_frame_rate(), _stream->channels (), fast));
+ _resampler.reset (new Resampler (_stream->frame_rate(), content->resampled_frame_rate(), _stream->channels ()));
}
reset_decoded ();
void
AudioDecoderStream::reset_decoded ()
{
- _decoded = ContentAudio (make_shared<AudioBuffers> (_stream->channels(), 0), 0);
+ _decoded = ContentAudio (shared_ptr<AudioBuffers> (new AudioBuffers (_stream->channels(), 0)), 0);
}
ContentAudio
Frame const to_return = max ((Frame) 0, min (available, length));
/* Copy our data to the output */
- shared_ptr<AudioBuffers> out = make_shared<AudioBuffers> (_decoded.audio->channels(), to_return);
+ shared_ptr<AudioBuffers> out (new AudioBuffers (_decoded.audio->channels(), to_return));
out->copy_from (_decoded.audio.get(), to_return, decoded_offset, 0);
Frame const remaining = max ((Frame) 0, available - to_return);
Frame const delta_frames = delta.frames_round (frame_rate);
if (delta_frames > 0) {
/* This data comes after the seek time. Pad the data with some silence. */
- shared_ptr<AudioBuffers> padded = make_shared<AudioBuffers> (data->channels(), data->frames() + delta_frames);
+ shared_ptr<AudioBuffers> padded (new AudioBuffers (data->channels(), data->frames() + delta_frames));
padded->make_silent ();
padded->copy_from (data.get(), data->frames(), 0, delta_frames);
data = padded;
*/
return;
}
- shared_ptr<AudioBuffers> trimmed = make_shared<AudioBuffers> (data->channels(), to_keep);
+ shared_ptr<AudioBuffers> trimmed (new AudioBuffers (data->channels(), to_keep));
trimmed->copy_from (data.get(), to_keep, to_discard, 0);
data = trimmed;
time += ContentTime::from_frames (to_discard, frame_rate);
_seek_reference = t;
}
}
+
+void
+AudioDecoderStream::set_fast ()
+{
+ if (_resampler) {
+ _resampler->set_fast ();
+ }
+}