#include "compose.hpp"
#include "dcpomatic_assert.h"
#include <samplerate.h>
-#include <boost/make_shared.hpp>
#include <iostream>
+#include <cmath>
#include "i18n.h"
using std::make_pair;
using std::runtime_error;
using boost::shared_ptr;
-using boost::make_shared;
/** @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 runtime_error (String::compose (N_("could not create sample-rate converter (%1)"), error));
}
src_delete (_src);
}
+void
+Resampler::set_fast ()
+{
+ src_delete (_src);
+ 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>
Resampler::run (shared_ptr<const AudioBuffers> in)
{
int in_frames = in->frames ();
int in_offset = 0;
int out_offset = 0;
- shared_ptr<AudioBuffers> resampled = make_shared<AudioBuffers> (_channels, 0);
+ shared_ptr<AudioBuffers> resampled (new AudioBuffers (_channels, 0));
while (in_frames > 0) {
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];
}
}
+ data.data_in = in_buffer;
data.input_frames = in_frames;
data.data_out = new float[max_resampled_frames * _channels];
}
if (data.output_frames_gen == 0) {
+ delete[] data.data_in;
+ delete[] data.data_out;
break;
}
shared_ptr<const AudioBuffers>
Resampler::flush ()
{
- shared_ptr<AudioBuffers> out = make_shared<AudioBuffers> (_channels, 0);
+ shared_ptr<AudioBuffers> out (new AudioBuffers (_channels, 0));
int out_offset = 0;
int64_t const output_size = 65536;
delete[] buffer;
return out;
}
+
+void
+Resampler::reset ()
+{
+ src_reset (_src);
+}