summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@wolfbeast.com>2020-01-07 21:24:58 +0100
committerwolfbeast <mcwerewolf@wolfbeast.com>2020-01-07 21:24:58 +0100
commitc0326517787e12bb5904d8f55386499628806b42 (patch)
treee352b79599433ed33bf02947b59f0075bd7e1970
parentc66b70c4da6877303d8951c10ce47dce0ff01366 (diff)
downloadUXP-c0326517787e12bb5904d8f55386499628806b42.tar
UXP-c0326517787e12bb5904d8f55386499628806b42.tar.gz
UXP-c0326517787e12bb5904d8f55386499628806b42.tar.lz
UXP-c0326517787e12bb5904d8f55386499628806b42.tar.xz
UXP-c0326517787e12bb5904d8f55386499628806b42.zip
Reject sample rates that are out-of-range for libsoundtouch.
We never reach this with our normal use of this lib but adding the sanity check just in case. (ported from upstream)
-rw-r--r--media/libsoundtouch/src/SoundTouch.cpp2
-rw-r--r--media/libsoundtouch/src/TDStretch.cpp9
2 files changed, 8 insertions, 3 deletions
diff --git a/media/libsoundtouch/src/SoundTouch.cpp b/media/libsoundtouch/src/SoundTouch.cpp
index a9d23fc3c..955818810 100644
--- a/media/libsoundtouch/src/SoundTouch.cpp
+++ b/media/libsoundtouch/src/SoundTouch.cpp
@@ -283,9 +283,9 @@ void SoundTouch::calcEffectiveRateAndTempo()
// Sets sample rate.
void SoundTouch::setSampleRate(uint srate)
{
- bSrateSet = true;
// set sample rate, leave other tempo changer parameters as they are.
pTDStretch->setParameters((int)srate);
+ bSrateSet = true;
}
diff --git a/media/libsoundtouch/src/TDStretch.cpp b/media/libsoundtouch/src/TDStretch.cpp
index 81bde22f0..b955bfc96 100644
--- a/media/libsoundtouch/src/TDStretch.cpp
+++ b/media/libsoundtouch/src/TDStretch.cpp
@@ -126,8 +126,13 @@ void TDStretch::setParameters(int aSampleRate, int aSequenceMS,
int aSeekWindowMS, int aOverlapMS)
{
// accept only positive parameter values - if zero or negative, use old values instead
- if (aSampleRate > 0) this->sampleRate = aSampleRate;
- if (aOverlapMS > 0) this->overlapMs = aOverlapMS;
+ if (aSampleRate > 0)
+ {
+ if (aSampleRate > 192000) ST_THROW_RT_ERROR("Error: Excessive samplerate");
+ this->sampleRate = aSampleRate;
+ }
+
+ if (aOverlapMS > 0) this->overlapMs = aOverlapMS;
if (aSequenceMS > 0)
{