projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
std::shared_ptr
[dcpomatic.git]
/
src
/
lib
/
resampler.cc
diff --git
a/src/lib/resampler.cc
b/src/lib/resampler.cc
index 4010390b8e663ebf413efe09ceb10498aace41a2..60eb7f5052a3e5ca4e47a14f850a83f762f75a05 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>
/*
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.
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
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,6
+25,7
@@
#include "dcpomatic_assert.h"
#include <samplerate.h>
#include <iostream>
#include "dcpomatic_assert.h"
#include <samplerate.h>
#include <iostream>
+#include <cmath>
#include "i18n.h"
#include "i18n.h"
@@
-31,28
+33,42
@@
using std::cout;
using std::pair;
using std::make_pair;
using std::runtime_error;
using std::pair;
using std::make_pair;
using std::runtime_error;
-using
boost
::shared_ptr;
+using
std
::shared_ptr;
/** @param in Input sampling rate (Hz)
* @param out Output sampling rate (Hz)
* @param channels Number of channels.
/** @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;
: _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));
}
}
Resampler::~Resampler ()
if (!_src) {
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_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>
}
shared_ptr<const AudioBuffers>
@@
-69,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;
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** 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];
for (int i = 0; i < in_frames; ++i) {
for (int j = 0; j < _channels; ++j) {
*q++ = p[j][in_offset + i];
@@
-81,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];
data.input_frames = in_frames;
data.data_out = new float[max_resampled_frames * _channels];
@@
-93,10
+110,20
@@
Resampler::run (shared_ptr<const AudioBuffers> in)
if (r) {
delete[] data.data_in;
delete[] data.data_out;
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) {
}
if (data.output_frames_gen == 0) {
+ delete[] data.data_in;
+ delete[] data.data_out;
break;
}
break;
}
@@
-132,7
+159,7
@@
Resampler::flush ()
int64_t const output_size = 65536;
float dummy[1];
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;
SRC_DATA data;
data.data_in = dummy;
@@
-144,6
+171,7
@@
Resampler::flush ()
int const r = src_process (_src, &data);
if (r) {
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)));
}
throw EncodeError (String::compose (N_("could not run sample-rate converter (%1)"), src_strerror (r)));
}
@@
-160,5
+188,12
@@
Resampler::flush ()
out_offset += data.output_frames_gen;
out->set_frames (out_offset);
out_offset += data.output_frames_gen;
out->set_frames (out_offset);
+ delete[] buffer;
return out;
}
return out;
}
+
+void
+Resampler::reset ()
+{
+ src_reset (_src);
+}