projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Configurable window arrangement in player dual-screen mode.
[dcpomatic.git]
/
src
/
lib
/
resampler.cc
diff --git
a/src/lib/resampler.cc
b/src/lib/resampler.cc
index ff93d1609ae5e68590c3dcb76f8e2a337be216bf..553180f0832c7a26852b2354bec045b1263faa01 100644
(file)
--- a/
src/lib/resampler.cc
+++ b/
src/lib/resampler.cc
@@
-25,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"
@@
-80,11
+81,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];
@@
-92,6
+93,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];
@@
-116,6
+118,8
@@
Resampler::run (shared_ptr<const AudioBuffers> in)
}
if (data.output_frames_gen == 0) {
}
if (data.output_frames_gen == 0) {
+ delete[] data.data_in;
+ delete[] data.data_out;
break;
}
break;
}
@@
-183,3
+187,9
@@
Resampler::flush ()
delete[] buffer;
return out;
}
delete[] buffer;
return out;
}
+
+void
+Resampler::reset ()
+{
+ src_reset (_src);
+}