#include "sndfile_decoder.h"
#include "film.h"
#include "exceptions.h"
+#include "audio_buffers.h"
#include "i18n.h"
: Decoder (f)
, AudioDecoder (f)
, _sndfile_content (c)
+ , _deinterleave_buffer (0)
{
- _sndfile = sf_open (_sndfile_content->file().string().c_str(), SFM_READ, &_info);
+ _info.format = 0;
+ _sndfile = sf_open (_sndfile_content->path().string().c_str(), SFM_READ, &_info);
if (!_sndfile) {
throw DecodeError (_("could not open audio file for reading"));
}
+ _done = 0;
_remaining = _info.frames;
}
SndfileDecoder::~SndfileDecoder ()
{
- if (_sndfile) {
- sf_close (_sndfile);
- }
+ sf_close (_sndfile);
+ delete[] _deinterleave_buffer;
}
-bool
+void
SndfileDecoder::pass ()
{
/* Do things in half second blocks as I think there may be limits
to what FFmpeg (and in particular the resampler) can cope with.
*/
- sf_count_t const block = _sndfile_content->audio_frame_rate() / 2;
+ sf_count_t const block = _sndfile_content->content_audio_frame_rate() / 2;
sf_count_t const this_time = min (block, _remaining);
+
+ int const channels = _sndfile_content->audio_channels ();
- shared_ptr<AudioBuffers> audio (new AudioBuffers (_sndfile_content->audio_channels(), this_time));
- sf_read_float (_sndfile, audio->data(0), this_time);
- audio->set_frames (this_time);
- Audio (audio);
- _remaining -= this_time;
+ shared_ptr<AudioBuffers> data (new AudioBuffers (channels, this_time));
- return (_remaining == 0);
+ if (_sndfile_content->audio_channels() == 1) {
+ /* No de-interleaving required */
+ sf_read_float (_sndfile, data->data(0), this_time);
+ } else {
+ /* Deinterleave */
+ if (!_deinterleave_buffer) {
+ _deinterleave_buffer = new float[block * channels];
+ }
+ sf_readf_float (_sndfile, _deinterleave_buffer, this_time);
+ vector<float*> out_ptr (channels);
+ for (int i = 0; i < channels; ++i) {
+ out_ptr[i] = data->data(i);
+ }
+ float* in_ptr = _deinterleave_buffer;
+ for (int i = 0; i < this_time; ++i) {
+ for (int j = 0; j < channels; ++j) {
+ *out_ptr[j]++ = *in_ptr++;
+ }
+ }
+ }
+
+ data->set_frames (this_time);
+ audio (data, _done);
+ _done += this_time;
+ _remaining -= this_time;
}
int
return _info.channels;
}
-ContentAudioFrame
+AudioContent::Frame
SndfileDecoder::audio_length () const
{
return _info.frames;
{
return _info.samplerate;
}
+
+bool
+SndfileDecoder::done () const
+{
+ return _audio_position >= _sndfile_content->audio_length ();
+}