More player debugging for butler video-full states.

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

diff --git a/src/lib/resampler.cc b/src/lib/resampler.cc
index c18bad3ac9eccfcb7b1b9c5ea6fc286207b94d89..322c00c136779f009ad1163119bce5496a191dad 100644 (file)
--- a/src/lib/resampler.cc
+++ b/src/lib/resampler.cc
@@ -1,19 +1,20 @@
 /*
     Copyright (C) 2013-2015 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
@@ -24,34 +25,50 @@
 #include "dcpomatic_assert.h"
 #include <samplerate.h>
 #include <iostream>
+#include <cmath>
 
 #include "i18n.h"
 
 using std::cout;
 using std::pair;
 using std::make_pair;
+using std::runtime_error;
 using boost::shared_ptr;
 
 /** @param in Input sampling rate (Hz)
  *  @param out Output sampling rate (Hz)
  *  @param channels Number of channels.
- *  @param fast true to be fast rather than good.
  */
-Resampler::Resampler (int in, int out, int channels, bool fast)
+Resampler::Resampler (int in, int out, int channels)
        : _in_rate (in)
        , _out_rate (out)
        , _channels (channels)
 {
        int error;
-       _src = src_new (fast ? SRC_LINEAR : SRC_SINC_BEST_QUALITY, _channels, &error);
+       _src = src_new (SRC_SINC_BEST_QUALITY, _channels, &error);
        if (!_src) {
-               throw StringError (String::compose (N_("could not create sample-rate converter (%1)"), error));
+               throw runtime_error (String::compose (N_("could not create sample-rate converter (%1)"), error));
        }
 }
 
 Resampler::~Resampler ()
+{
+       if (_src) {
+               src_delete (_src);
+       }
+}
+
+void
+Resampler::set_fast ()
 {
        src_delete (_src);
+       _src = 0;
+
+       int error;
+       _src = src_new (SRC_LINEAR, _channels, &error);
+       if (!_src) {
+               throw runtime_error (String::compose (N_("could not create sample-rate converter (%1)"), error));
+       }
 }
 
 shared_ptr<const AudioBuffers>
@@ -68,11 +85,11 @@ Resampler::run (shared_ptr<const AudioBuffers> in)
                int const max_resampled_frames = ceil ((double) in_frames * _out_rate / _in_rate) + 32;
 
                SRC_DATA data;
-               data.data_in = new float[in_frames * _channels];
+               float* in_buffer = new float[in_frames * _channels];
 
                {
                        float** p = in->data ();
-                       float* q = data.data_in;
+                       float* q = in_buffer;
                        for (int i = 0; i < in_frames; ++i) {
                                for (int j = 0; j < _channels; ++j) {
                                        *q++ = p[j][in_offset + i];
@@ -80,6 +97,7 @@ Resampler::run (shared_ptr<const AudioBuffers> in)
                        }
                }
 
+               data.data_in = in_buffer;
                data.input_frames = in_frames;
 
                data.data_out = new float[max_resampled_frames * _channels];
@@ -92,10 +110,20 @@ Resampler::run (shared_ptr<const AudioBuffers> in)
                if (r) {
                        delete[] data.data_in;
                        delete[] data.data_out;
-                       throw EncodeError (String::compose (N_("could not run sample-rate converter (%1)"), src_strerror (r)));
+                       throw EncodeError (
+                               String::compose (
+                                       N_("could not run sample-rate converter (%1) [processing %2 to %3, %4 channels]"),
+                                       src_strerror (r),
+                                       in_frames,
+                                       max_resampled_frames,
+                                       _channels
+                                       )
+                               );
                }
 
                if (data.output_frames_gen == 0) {
+                       delete[] data.data_in;
+                       delete[] data.data_out;
                        break;
                }
 
@@ -131,7 +159,7 @@ Resampler::flush ()
        int64_t const output_size = 65536;
 
        float dummy[1];
-       float buffer[output_size];
+       float* buffer = new float[output_size];
 
        SRC_DATA data;
        data.data_in = dummy;
@@ -143,6 +171,7 @@ Resampler::flush ()
 
        int const r = src_process (_src, &data);
        if (r) {
+               delete[] buffer;
                throw EncodeError (String::compose (N_("could not run sample-rate converter (%1)"), src_strerror (r)));
        }
 
@@ -159,5 +188,12 @@ Resampler::flush ()
        out_offset += data.output_frames_gen;
        out->set_frames (out_offset);
 
+       delete[] buffer;
        return out;
 }
+
+void
+Resampler::reset ()
+{
+       src_reset (_src);
+}