Merge branch 'main' of https://github.com/sdatkinson/AudioDSPTools

sdatkinson · Apr 4, 2024 · 008718f · 008718f
2 parents ecf6854 + def8bf7
commit 008718f
Show file tree

Hide file tree

Showing 2 changed files with 65 additions and 15 deletions.
diff --git a/dsp/ResamplingContainer/Dependencies/LanczosResampler.h b/dsp/ResamplingContainer/Dependencies/LanczosResampler.h
@@ -149,11 +149,12 @@ class LanczosResampler
    */
   LanczosResampler(float inputRate, float outputRate)
   : mInputSampleRate(inputRate)
-  , mOutputSamplerate(outputRate)
-  , mPhaseOutIncr(mInputSampleRate / mOutputSamplerate)
+  , mOutputSampleRate(outputRate)
   {
+    SetPhases();
     ClearBuffer();
 
+
     auto kernel = [](double x) {
       if (std::fabs(x) < 1e-7)
         return T(1.0);
@@ -200,7 +201,9 @@ class LanczosResampler
      * Use the fact that mPhaseInIncr = mInputSampleRate and find
      * res > (A+1) - (mPhaseIn - mPhaseOut + mPhaseOutIncr * desiredOutputs) * sri
      */
-    auto res = A + 1.0 - (mPhaseIn - mPhaseOut - mPhaseOutIncr * nOutputSamples);
+    double res = A + 1.0
+                 - ((double)(mPhaseInNumerator - mPhaseOutNumerator - mPhaseOutIncrNumerator * (long)nOutputSamples))
+                     / ((double)mPhaseDenominator);
 
     return static_cast<size_t>(std::max(res + 1.0, 0.0));
   }
@@ -216,26 +219,26 @@ class LanczosResampler
       }
 
       mWritePos = (mWritePos + 1) & (kBufferSize - 1);
-      mPhaseIn += mPhaseInIncr;
+      mPhaseInNumerator += mPhaseInIncrNumerator;
     }
   }
 
   size_t PopBlock(T** outputs, size_t max)
   {
     int populated = 0;
-    while (populated < max && (mPhaseIn - mPhaseOut) > A + 1)
+    while (populated < max && (mPhaseInNumerator - mPhaseOutNumerator) > mPhaseDenominator * (A + 1))
     {
-      ReadSamples((mPhaseIn - mPhaseOut), outputs, populated);
-      mPhaseOut += mPhaseOutIncr;
+      ReadSamples(((double)(mPhaseInNumerator - mPhaseOutNumerator)) / ((double)mPhaseDenominator), outputs, populated);
+      mPhaseOutNumerator += mPhaseOutIncrNumerator;
       populated++;
     }
     return populated;
   }
 
   inline void RenormalizePhases()
   {
-    mPhaseIn -= mPhaseOut;
-    mPhaseOut = 0;
+    mPhaseInNumerator -= mPhaseOutNumerator;
+    mPhaseOutNumerator = 0;
   }
 
   void Reset() { ClearBuffer(); }
@@ -341,6 +344,41 @@ class LanczosResampler
     }
   }
 #endif
+  void SetPhases()
+  {
+    // This is going to assume I can treat the sample rates as longs...
+    // But if they're not, then things will sound just a little wrong and honestly I'm fine with that.
+    // It's your fault for not using something normal like 44.1k, 48k, or their multiples.
+    // (Looking at you, VST3PluginTestHost!)
+    auto AssertLongLikeSampleRate = [](double x) {
+      if ((double)((long)x) != x)
+      {
+        std::cerr << "Expected long-like sample rate; got " << x << " instead! Truncating..." << std::endl;
+      }
+      return (long)x;
+    };
+
+    // Greatest common denominator
+    auto gcd = [](long a, long b) -> long {
+      while (b != 0)
+      {
+        long temp = b;
+        b = a % b;
+        a = temp;
+      }
+      return a;
+    };
+
+    const long inputSampleRate = AssertLongLikeSampleRate(mInputSampleRate);
+    const long outputSampleRate = AssertLongLikeSampleRate(mOutputSampleRate);
+    const long g = gcd(inputSampleRate, outputSampleRate);
+
+    // mPhaseInIncr = 1.0
+    // mPhaseOutIncr = mInputSampleRate / mOutputSampleRate
+    mPhaseInIncrNumerator = outputSampleRate / g;
+    mPhaseDenominator = mPhaseInIncrNumerator; // val / val = 1
+    mPhaseOutIncrNumerator = inputSampleRate / g;
+  };
 
   static T sTable alignas(16)[kTablePoints + 1][kFilterWidth];
   static T sDeltaTable alignas(16)[kTablePoints + 1][kFilterWidth];
@@ -349,11 +387,14 @@ class LanczosResampler
   T mInputBuffer[NCHANS][kBufferSize * 2];
   int mWritePos = 0;
   const float mInputSampleRate;
-  const float mOutputSamplerate;
-  double mPhaseIn = 0.0;
-  double mPhaseOut = 0.0;
-  double mPhaseInIncr = 1.0;
-  double mPhaseOutIncr = 0.0;
+  const float mOutputSampleRate;
+  // Phase is treated as rational numbers to ensure floating point errors don't accumulate and we stay exactly on.
+  // (Issue 15)
+  long mPhaseInNumerator = 0;
+  long mPhaseOutNumerator = 0;
+  long mPhaseInIncrNumerator = 1;
+  long mPhaseOutIncrNumerator = 1;
+  long mPhaseDenominator = 1;
 };
 
 template <typename T, int NCHANS, size_t A>

diff --git a/dsp/ResamplingContainer/ResamplingContainer.h b/dsp/ResamplingContainer/ResamplingContainer.h
@@ -191,7 +191,16 @@ class ResamplingContainer
     const auto populated2 = mResampler2->PopBlock(outputs, nFrames);
     if (populated2 < nFrames)
     {
-      throw std::runtime_error("Did not yield enough samples to provide the required output buffer!");
+      std::cerr << "Did not yield enough samples (" << populated2 << ") to provide the required output buffer (expected"
+                << nFrames << ")! Filling with last sample..." << std::endl;
+      for (int c = 0; c < NCHANS; c++)
+      {
+        const T lastSample = populated2 > 0 ? outputs[c][populated2 - 1] : 0.0;
+        for (int i = populated2; i < nFrames; i++)
+        {
+          outputs[c][i] = lastSample;
+        }
+      }
     }
     // Get ready for the next block:
     mResampler1->RenormalizePhases();