using std::list;
using std::pair;
using std::cout;
+using std::min;
using boost::optional;
using boost::shared_ptr;
AudioDecoder::AudioDecoder (shared_ptr<const AudioContent> content)
: _audio_content (content)
- , _decoded_audio (shared_ptr<AudioBuffers> (new AudioBuffers (content->audio_channels(), 0)), 0)
{
if (content->output_audio_frame_rate() != content->content_audio_frame_rate() && content->audio_channels ()) {
_resampler.reset (new Resampler (content->content_audio_frame_rate(), content->output_audio_frame_rate(), content->audio_channels ()));
}
+
+ reset_decoded_audio ();
+}
+
+void
+AudioDecoder::reset_decoded_audio ()
+{
+ _decoded_audio = ContentAudio (shared_ptr<AudioBuffers> (new AudioBuffers (_audio_content->audio_channels(), 0)), 0);
}
shared_ptr<ContentAudio>
seek (ContentTime::from_frames (frame, _audio_content->content_audio_frame_rate()), accurate);
}
+ AudioFrame decoded_offset = 0;
+
/* Now enough pass() calls will either:
* (a) give us what we want, or
* (b) hit the end of the decoder.
*/
if (accurate) {
while (!pass() && _decoded_audio.audio->frames() < length) {}
+ /* Use decoded_offset of 0, as we don't really care what frames we return */
} else {
while (!pass() && (_decoded_audio.frame > frame || (_decoded_audio.frame + _decoded_audio.audio->frames()) < end)) {}
+ decoded_offset = frame - _decoded_audio.frame;
}
-
- /* Clean up decoded */
- AudioFrame const decoded_offset = frame - _decoded_audio.frame;
AudioFrame const amount_left = _decoded_audio.audio->frames() - decoded_offset;
- _decoded_audio.audio->move (decoded_offset, 0, amount_left);
- _decoded_audio.audio->set_frames (amount_left);
-
- shared_ptr<AudioBuffers> out (new AudioBuffers (_decoded_audio.audio->channels(), length));
- out->copy_from (_decoded_audio.audio.get(), length, frame - _decoded_audio.frame, 0);
+
+ AudioFrame const to_return = min (amount_left, length);
+ shared_ptr<AudioBuffers> out (new AudioBuffers (_decoded_audio.audio->channels(), to_return));
+ out->copy_from (_decoded_audio.audio.get(), to_return, decoded_offset, 0);
+
+ /* Clean up decoded */
+ _decoded_audio.audio->move (decoded_offset + to_return, 0, amount_left - to_return);
+ _decoded_audio.audio->set_frames (amount_left - to_return);
return shared_ptr<ContentAudio> (new ContentAudio (out, frame));
}
_audio_position = time.frames (_audio_content->output_audio_frame_rate ());
}
- assert (_audio_position >= (_decoded_audio.frame + _decoded_audio.audio->frames()));
+ assert (_audio_position.get() >= (_decoded_audio.frame + _decoded_audio.audio->frames()));
/* Resize _decoded_audio to fit the new data */
- _decoded_audio.audio->ensure_size (_audio_position.get() + data->frames() - _decoded_audio.frame);
+ int const new_size = _audio_position.get() + data->frames() - _decoded_audio.frame;
+ _decoded_audio.audio->ensure_size (new_size);
+ _decoded_audio.audio->set_frames (new_size);
/* Copy new data in */
_decoded_audio.audio->copy_from (data.get(), data->frames(), 0, _audio_position.get() - _decoded_audio.frame);
AudioDecoder::seek (ContentTime, bool)
{
_audio_position.reset ();
+ reset_decoded_audio ();
}