Merge master and multifarious hackery.

[dcpomatic.git] / src / lib / sndfile_decoder.cc

diff --git a/src/lib/sndfile_decoder.cc b/src/lib/sndfile_decoder.cc
index 8848ff4f8a195fef29e3c268782e719322647387..c4c6e5f4ee065f6dca6145defbb293bedcb5b7d1 100644 (file)
--- a/src/lib/sndfile_decoder.cc
+++ b/src/lib/sndfile_decoder.cc
@@ -23,64 +23,97 @@
 #include "sndfile_decoder.h"
 #include "film.h"
 #include "exceptions.h"
+#include "audio_buffers.h"
 
 #include "i18n.h"
 
 using std::vector;
 using std::string;
-using std::stringstream;
 using std::min;
 using std::cout;
 using boost::shared_ptr;
-using boost::optional;
 
-/* XXX */
-
-SndfileDecoder::SndfileDecoder (shared_ptr<const Film> f, shared_ptr<SndfileContent> c, DecodeOptions o)
-       : Decoder (f, o)
-       , AudioDecoder (f, c, o)
+SndfileDecoder::SndfileDecoder (shared_ptr<const Film> f, shared_ptr<const SndfileContent> c)
+       : Decoder (f)
+       , AudioDecoder (f, c)
+       , _sndfile_content (c)
+       , _deinterleave_buffer (0)
 {
-       sf_count_t frames;
-       SNDFILE* sf = open_file (frames);
-       sf_close (sf);
+       _sndfile = sf_open (_sndfile_content->file().string().c_str(), SFM_READ, &_info);
+       if (!_sndfile) {
+               throw DecodeError (_("could not open audio file for reading"));
+       }
+
+       _done = 0;
+       _remaining = _info.frames;
 }
 
-SNDFILE*
-SndfileDecoder::open_file (sf_count_t & frames)
+SndfileDecoder::~SndfileDecoder ()
 {
-       frames = 0;
-       
-       SF_INFO info;
-       SNDFILE* s = sf_open (_sndfile_content->file().string().c_str(), SFM_READ, &info);
-       if (!s) {
-               throw DecodeError (_("could not open external audio file for reading"));
-       }
-
-       frames = info.frames;
-       return s;
+       sf_close (_sndfile);
+       delete[] _deinterleave_buffer;
 }
 
-bool
+void
 SndfileDecoder::pass ()
 {
-       sf_count_t frames;
-       SNDFILE* sndfile = open_file (frames);
-
        /* 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;
-
-       shared_ptr<AudioBuffers> audio (new AudioBuffers (_sndfile_content->audio_channels(), block));
-       while (frames > 0) {
-               sf_count_t const this_time = min (block, frames);
-               sf_read_float (sndfile, audio->data(0), this_time);
-               audio->set_frames (this_time);
-               Audio (audio);
-               frames -= this_time;
+       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> data (new AudioBuffers (channels, this_time));
+
+       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, double(_done) / audio_frame_rate());
+       _done += this_time;
+       _remaining -= this_time;
+}
 
-       sf_close (sndfile);
+int
+SndfileDecoder::audio_channels () const
+{
+       return _info.channels;
+}
+
+ContentAudioFrame
+SndfileDecoder::audio_length () const
+{
+       return _info.frames;
+}
 
-       return true;
+int
+SndfileDecoder::audio_frame_rate () const
+{
+       return _info.samplerate;
+}
+
+Time
+SndfileDecoder::next () const
+{
+       return _next_audio;
 }