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

Fix use of final flag more than once at end of processing (causing a test failure with libsamplerate)

Browse Source
This commit is contained in:
Chris Cannam
2023-04-05 11:14:04 +01:00
parent 376bf4dbd6
commit b9f2b58e1f
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/common/Resampler.cpp
View File

@@ -695,7 +695,7 @@ D_SRC::resampleInterleaved(float *const BQ_R__ out,
// expected output, and (b) when the ratio has just changed, we
// should aim to supply a shortish block next
if (outcount > int(ceil(incount * ratio) + 5)) {
if (!final && (outcount > int(ceil(incount * ratio) + 5))) {
outcount = int(ceil(incount * ratio) + 5);
}
@@ -754,6 +754,10 @@ D_SRC::resampleInterleaved(float *const BQ_R__ out,
#endif
}
// cerr << "Resampler::process: final = " << final << ", incount = "
// << incount << ", outcount = " << outcount << ", ratio = "
// << ratio << ", gen = " << data.output_frames_gen << endl;
return (int)data.output_frames_gen;
}