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

Avoid an input increment of zero (= sigfpe) when given a very long stretch factor

Browse Source
This commit is contained in:
Chris Cannam
2020-09-15 15:23:33 +01:00
parent 6de1ab5b68
commit be843f3da7
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/StretcherImpl.cpp
View File

@@ -466,6 +466,10 @@ RubberBandStretcher::Impl::calculateSizes()
outputIncrement /= 2; outputIncrement /= 2;
inputIncrement = int(outputIncrement / r); inputIncrement = int(outputIncrement / r);
} }
while (inputIncrement < 1) {
outputIncrement *= 2;
inputIncrement = int(outputIncrement / r);
}
size_t minwin = roundUp(lrint(outputIncrement * windowIncrRatio)); size_t minwin = roundUp(lrint(outputIncrement * windowIncrRatio));
if (windowSize < minwin) windowSize = minwin; if (windowSize < minwin) windowSize = minwin;
@@ -501,6 +505,10 @@ RubberBandStretcher::Impl::calculateSizes()
outputIncrement /= 2; outputIncrement /= 2;
inputIncrement = int(outputIncrement / r); inputIncrement = int(outputIncrement / r);
} }
while (inputIncrement < 1) {
outputIncrement *= 2;
inputIncrement = int(outputIncrement / r);
}
windowSize = std::max(windowSize, roundUp(outputIncrement * 6)); windowSize = std::max(windowSize, roundUp(outputIncrement * 6));
if (r > 5) while (windowSize < 8192) windowSize *= 2; if (r > 5) while (windowSize < 8192) windowSize *= 2;
} }