#include "audio_decoder.h"
#include "resampler.h"
#include "util.h"
+#include "film.h"
+#include "log.h"
#include <iostream>
#include "i18n.h"
{
shared_ptr<ContentAudio> dec;
+ _content->film()->log()->log (String::compose ("ADS has request for %1 %2", frame, length), Log::TYPE_DEBUG_DECODE);
+
Frame const end = frame + length - 1;
-
+
if (frame < _decoded.frame || end > (_decoded.frame + length * 4)) {
/* Either we have no decoded data, or what we do have is a long way from what we want: seek */
seek (ContentTime::from_frames (frame, _content->resampled_audio_frame_rate()), accurate);
(to be set up shortly)
*/
Frame decoded_offset = 0;
-
+
/* Now enough pass() calls will either:
* (a) give us what we want, or
* (b) hit the end of the decoder.
!_decoder->pass ()
)
{}
-
+
decoded_offset = frame - _decoded.frame;
} else {
while (
!_decoder->pass ()
)
{}
-
+
/* Use decoded_offset of 0, as we don't really care what frames we return */
}
void
AudioDecoderStream::audio (shared_ptr<const AudioBuffers> data, ContentTime time)
{
+ _content->film()->log()->log (String::compose ("ADS receives %1 %2", time, data->frames ()), Log::TYPE_DEBUG_DECODE);
+
if (_resampler) {
data = _resampler->run (data);
}
*/
return;
}
-
+
/* Resize _decoded to fit the new data */
int new_size = 0;
if (_decoded.audio->frames() == 0) {
/* Otherwise we need to extend _decoded to include the new stuff */
new_size = _position.get() + data->frames() - _decoded.frame;
}
-
+
_decoded.audio->ensure_size (new_size);
_decoded.audio->set_frames (new_size);