Update SoundTouch to 2.3.2 commit 1eda9c0b01039f29d230a46cda9f2290bbd1f62b

1 files changed, 86 insertions, 74 deletions

diff --git a/Externals/soundtouch/SoundTouch.cpp b/Externals/soundtouch/SoundTouch.cpp
index edccce238d..cb161f0d4f 100644
--- a/Externals/soundtouch/SoundTouch.cpp
+++ b/Externals/soundtouch/SoundTouch.cpp
@@ -41,13 +41,6 @@
 ///

 ////////////////////////////////////////////////////////////////////////////////

 //

-// Last changed  : $Date: 2015-07-26 17:45:48 +0300 (Sun, 26 Jul 2015) $

-// File revision : $Revision: 4 $

-//

-// $Id: SoundTouch.cpp 225 2015-07-26 14:45:48Z oparviai $

-//

-////////////////////////////////////////////////////////////////////////////////

-//

 // License :

 //

 //  SoundTouch audio processing library

@@ -110,15 +103,14 @@ SoundTouch::SoundTouch()
 

     calcEffectiveRateAndTempo();

 

-	samplesExpectedOut = 0;

-	samplesOutput = 0;

+    samplesExpectedOut = 0;

+    samplesOutput = 0;

 

     channels = 0;

     bSrateSet = false;

 }

 

 

-

 SoundTouch::~SoundTouch()

 {

     delete pRateTransposer;

@@ -126,7 +118,6 @@ SoundTouch::~SoundTouch()
 }

 

 

-

 /// Get SoundTouch library version string

 const char *SoundTouch::getVersionString()

 {

@@ -146,18 +137,14 @@ uint SoundTouch::getVersionId()
 // Sets the number of channels, 1 = mono, 2 = stereo

 void SoundTouch::setChannels(uint numChannels)

 {

-    /*if (numChannels != 1 && numChannels != 2) 

-    {

-        //ST_THROW_RT_ERROR("Illegal number of channels");

-		return;

-    }*/

+    if (!verifyNumberOfChannels(numChannels)) return;

+

     channels = numChannels;

     pRateTransposer->setChannels((int)numChannels);

     pTDStretch->setChannels((int)numChannels);

 }

 

 

-

 // Sets new rate control value. Normal rate = 1.0, smaller values

 // represent slower rate, larger faster rates.

 void SoundTouch::setRate(double newRate)

@@ -167,7 +154,6 @@ void SoundTouch::setRate(double newRate)
 }

 

 

-

 // Sets new rate control value as a difference in percents compared

 // to the original rate (-50 .. +100 %)

 void SoundTouch::setRateChange(double newRate)

@@ -177,7 +163,6 @@ void SoundTouch::setRateChange(double newRate)
 }

 

 

-

 // Sets new tempo control value. Normal tempo = 1.0, smaller values

 // represent slower tempo, larger faster tempo.

 void SoundTouch::setTempo(double newTempo)

@@ -187,7 +172,6 @@ void SoundTouch::setTempo(double newTempo)
 }

 

 

-

 // Sets new tempo control value as a difference in percents compared

 // to the original tempo (-50 .. +100 %)

 void SoundTouch::setTempoChange(double newTempo)

@@ -197,7 +181,6 @@ void SoundTouch::setTempoChange(double newTempo)
 }

 

 

-

 // Sets new pitch control value. Original pitch = 1.0, smaller values

 // represent lower pitches, larger values higher pitch.

 void SoundTouch::setPitch(double newPitch)

@@ -207,7 +190,6 @@ void SoundTouch::setPitch(double newPitch)
 }

 

 

-

 // Sets pitch change in octaves compared to the original pitch

 // (-1.00 .. +1.00)

 void SoundTouch::setPitchOctaves(double newPitch)

@@ -217,7 +199,6 @@ void SoundTouch::setPitchOctaves(double newPitch)
 }

 

 

-

 // Sets pitch change in semi-tones compared to the original pitch

 // (-12 .. +12)

 void SoundTouch::setPitchSemiTones(int newPitch)

@@ -226,7 +207,6 @@ void SoundTouch::setPitchSemiTones(int newPitch)
 }

 

 

-

 void SoundTouch::setPitchSemiTones(double newPitch)

 {

     setPitchOctaves(newPitch / 12.0);

@@ -240,11 +220,11 @@ void SoundTouch::calcEffectiveRateAndTempo()
     double oldTempo = tempo;

     double oldRate = rate;

 

-	tempo = virtualTempo / virtualPitch;

-	rate = virtualPitch * virtualRate;

+    tempo = virtualTempo / virtualPitch;

+    rate = virtualPitch * virtualRate;

 

     if (!TEST_FLOAT_EQUAL(rate,oldRate)) pRateTransposer->setRate(rate);

-	if (!TEST_FLOAT_EQUAL(tempo, oldTempo)) pTDStretch->setTempo(tempo);

+    if (!TEST_FLOAT_EQUAL(tempo, oldTempo)) pTDStretch->setTempo(tempo);

 

 #ifndef SOUNDTOUCH_PREVENT_CLICK_AT_RATE_CROSSOVER

     if (rate <= 1.0f) 

@@ -286,9 +266,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;

 }

 

 

@@ -305,25 +285,9 @@ void SoundTouch::putSamples(const SAMPLETYPE *samples, uint nSamples)
         ST_THROW_RT_ERROR("SoundTouch : Number of channels not defined");

     }

 

-    // Transpose the rate of the new samples if necessary

-    /* Bypass the nominal setting - can introduce a click in sound when tempo/pitch control crosses the nominal value...

-    if (rate == 1.0f) 

-    {

-        // The rate value is same as the original, simply evaluate the tempo changer. 

-        assert(output == pTDStretch);

-        if (pRateTransposer->isEmpty() == 0) 

-        {

-            // yet flush the last samples in the pitch transposer buffer

-            // (may happen if 'rate' changes from a non-zero value to zero)

-            pTDStretch->moveSamples(*pRateTransposer);

-        }

-        pTDStretch->putSamples(samples, nSamples);

-    } 

-    */

-

-	// accumulate how many samples are expected out from processing, given the current 

-	// processing setting

-	samplesExpectedOut += (double)nSamples / ((double)rate * (double)tempo);

+    // accumulate how many samples are expected out from processing, given the current 

+    // processing setting

+    samplesExpectedOut += (double)nSamples / ((double)rate * (double)tempo);

 

 #ifndef SOUNDTOUCH_PREVENT_CLICK_AT_RATE_CROSSOVER

     if (rate <= 1.0f) 

@@ -354,28 +318,28 @@ void SoundTouch::putSamples(const SAMPLETYPE *samples, uint nSamples)
 void SoundTouch::flush()

 {

     int i;

-	int numStillExpected;

+    int numStillExpected;

     SAMPLETYPE *buff = new SAMPLETYPE[128 * channels];

 

-	// how many samples are still expected to output

-	numStillExpected = (int)((long)(samplesExpectedOut + 0.5) - samplesOutput);

+    // how many samples are still expected to output

+    numStillExpected = (int)((long)(samplesExpectedOut + 0.5) - samplesOutput);

+    if (numStillExpected < 0) numStillExpected = 0;

 

     memset(buff, 0, 128 * channels * sizeof(SAMPLETYPE));

     // "Push" the last active samples out from the processing pipeline by

     // feeding blank samples into the processing pipeline until new, 

     // processed samples appear in the output (not however, more than 

     // 24ksamples in any case)

-	for (i = 0; (numStillExpected > (int)numSamples()) && (i < 200); i ++)

-	{

-		putSamples(buff, 128);

-	}

+    for (i = 0; (numStillExpected > (int)numSamples()) && (i < 200); i ++)

+    {

+        putSamples(buff, 128);

+    }

 

-	adjustAmountOfSamples(numStillExpected);

+    adjustAmountOfSamples(numStillExpected);

 

     delete[] buff;

 

     // Clear input buffers

- //   pRateTransposer->clearInput();

     pTDStretch->clearInput();

     // yet leave the output intouched as that's where the

     // flushed samples are!

@@ -446,27 +410,67 @@ int SoundTouch::getSetting(int settingId) const
             return pRateTransposer->getAAFilter()->getLength();

 

         case SETTING_USE_QUICKSEEK :

-            return (uint)   pTDStretch->isQuickSeekEnabled();

+            return (uint)pTDStretch->isQuickSeekEnabled();

 

         case SETTING_SEQUENCE_MS:

-            pTDStretch->getParameters(NULL, &temp, NULL, NULL);

+            pTDStretch->getParameters(nullptr, &temp, nullptr, nullptr);

             return temp;

 

         case SETTING_SEEKWINDOW_MS:

-            pTDStretch->getParameters(NULL, NULL, &temp, NULL);

+            pTDStretch->getParameters(nullptr, nullptr, &temp, nullptr);

             return temp;

 

         case SETTING_OVERLAP_MS:

-            pTDStretch->getParameters(NULL, NULL, NULL, &temp);

+            pTDStretch->getParameters(nullptr, nullptr, nullptr, &temp);

             return temp;

 

-		case SETTING_NOMINAL_INPUT_SEQUENCE :

-			return pTDStretch->getInputSampleReq();

+        case SETTING_NOMINAL_INPUT_SEQUENCE :

+        {

+            int size = pTDStretch->getInputSampleReq();

+

+#ifndef SOUNDTOUCH_PREVENT_CLICK_AT_RATE_CROSSOVER

+            if (rate <= 1.0)

+            {

+                // transposing done before timestretch, which impacts latency

+                return (int)(size * rate + 0.5);

+            }

+#endif

+            return size;

+        }

+

+        case SETTING_NOMINAL_OUTPUT_SEQUENCE :

+        {

+            int size = pTDStretch->getOutputBatchSize();

+

+            if (rate > 1.0)

+            {

+                // transposing done after timestretch, which impacts latency

+                return (int)(size / rate + 0.5);

+            }

+            return size;

+        }

+

+        case SETTING_INITIAL_LATENCY:

+        {

+            double latency = pTDStretch->getLatency();

+            int latency_tr = pRateTransposer->getLatency();

+

+#ifndef SOUNDTOUCH_PREVENT_CLICK_AT_RATE_CROSSOVER

+            if (rate <= 1.0)

+            {

+                // transposing done before timestretch, which impacts latency

+                latency = (latency + latency_tr) * rate;

+            }

+            else

+#endif

+            {

+                latency += (double)latency_tr / rate;

+            }

 

-		case SETTING_NOMINAL_OUTPUT_SEQUENCE :

-			return pTDStretch->getOutputBatchSize();

+            return (int)(latency + 0.5);

+        }

 

-		default :

+        default :

             return 0;

     }

 }

@@ -476,13 +480,13 @@ int SoundTouch::getSetting(int settingId) const
 // buffers.

 void SoundTouch::clear()

 {

-	samplesExpectedOut = 0;

+    samplesExpectedOut = 0;

+    samplesOutput = 0;

     pRateTransposer->clear();

     pTDStretch->clear();

 }

 

 

-

 /// Returns number of samples currently unprocessed.

 uint SoundTouch::numUnprocessedSamples() const

 {

@@ -499,7 +503,6 @@ uint SoundTouch::numUnprocessedSamples() const
 }

 

 

-

 /// Output samples from beginning of the sample buffer. Copies requested samples to 

 /// output buffer and removes them from the sample buffer. If there are less than 

 /// 'numsample' samples in the buffer, returns all that available.

@@ -507,9 +510,9 @@ uint SoundTouch::numUnprocessedSamples() const
 /// \return Number of samples returned.

 uint SoundTouch::receiveSamples(SAMPLETYPE *output, uint maxSamples)

 {

-	uint ret = FIFOProcessor::receiveSamples(output, maxSamples);

-	samplesOutput += (long)ret;

-	return ret;

+    uint ret = FIFOProcessor::receiveSamples(output, maxSamples);

+    samplesOutput += (long)ret;

+    return ret;

 }

 

 

@@ -520,7 +523,16 @@ uint SoundTouch::receiveSamples(SAMPLETYPE *output, uint maxSamples)
 /// with 'ptrBegin' function.

 uint SoundTouch::receiveSamples(uint maxSamples)

 {

-	uint ret = FIFOProcessor::receiveSamples(maxSamples);

-	samplesOutput += (long)ret;

-	return ret;

+    uint ret = FIFOProcessor::receiveSamples(maxSamples);

+    samplesOutput += (long)ret;

+    return ret;

+}

+

+

+/// Get ratio between input and output audio durations, useful for calculating

+/// processed output duration: if you'll process a stream of N samples, then 

+/// you can expect to get out N * getInputOutputSampleRatio() samples.

+double SoundTouch::getInputOutputSampleRatio()

+{

+    return 1.0 / (tempo * rate);

 }