david/librubberband
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix overrun

Browse Source
This commit is contained in:
Chris Cannam
2021-05-12 17:26:27 +01:00
parent 94d4467bfe
commit c1fd6fe6a5
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/dsp/BQResampler.cpp
View File

@@ -581,15 +581,17 @@ BQResampler::reconstruct_one(state *s) const
int phase_length = pr.length; int phase_length = pr.length;
double result = 0.0; double result = 0.0;
int dot_length = min(phase_length, int(s->buffer.size()) - s->left);
if (m_dynamism == RatioMostlyFixed) { if (m_dynamism == RatioMostlyFixed) {
int phase_start = pr.start_index; int phase_start = pr.start_index;
if (m_channels == 1) { if (m_channels == 1) {
result = v_multiply_and_sum result = v_multiply_and_sum
(s->phase_sorted_filter.data() + phase_start, (s->phase_sorted_filter.data() + phase_start,
s->buffer.data() + s->left, s->buffer.data() + s->left,
phase_length); dot_length);
} else { } else {
for (int i = 0; i < phase_length; ++i) { for (int i = 0; i < dot_length; ++i) {
result += result +=
s->phase_sorted_filter[phase_start + i] * s->phase_sorted_filter[phase_start + i] *
s->buffer[s->left + i * m_channels + s->current_channel]; s->buffer[s->left + i * m_channels + s->current_channel];
@@ -597,7 +599,7 @@ BQResampler::reconstruct_one(state *s) const
} }
} else { } else {
double m = double(m_proto_length - 1) / double(s->filter_length - 1); double m = double(m_proto_length - 1) / double(s->filter_length - 1);
for (int i = 0; i < phase_length; ++i) { for (int i = 0; i < dot_length; ++i) {
double sample = double sample =
s->buffer[s->left + i * m_channels + s->current_channel]; s->buffer[s->left + i * m_channels + s->current_channel];
int filter_index = i * s->parameters.numerator + s->current_phase; int filter_index = i * s->parameters.numerator + s->current_phase;