Fix a bug that ParallelComb doesn't output wet signal

On `BasicLimiter` in common/dsp/basiclimiter.hpp, when buffer size (set by `resize()`) and attack time (set by `setFrames()`) are the same value, `IntDelay` incorrectly outputs 0 sample delay, because of wrap around. This stops output of `DoubleAverageFilter`, and probably introducing off by some number error everywhere. There must be the same issue on BasicLimiter plugin, but resizing and setting attack time aren't tied. So it wasn't catched somehow.
ryukau · Jun 23, 2022 · 86bb16e · 86bb16e
1 parent b892c17
commit 86bb16e
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 19 deletions.
diff --git a/BasicLimiter/source/dsp/limiter.hpp b/BasicLimiter/source/dsp/limiter.hpp
@@ -35,7 +35,7 @@ template<typename Sample> class IntDelay {
 
   void resize(size_t size)
   {
-    buf.resize(size);
+    buf.resize(size + 1);
     wptr = 0;
     rptr = 0;
   }

diff --git a/BasicLimiter/source/version.hpp b/BasicLimiter/source/version.hpp
@@ -29,11 +29,11 @@
 #define SUB_VERSION_STR "1"
 #define SUB_VERSION_INT 1
 
-#define RELEASE_NUMBER_STR "8"
-#define RELEASE_NUMBER_INT 8
+#define RELEASE_NUMBER_STR "9"
+#define RELEASE_NUMBER_INT 9
 
-#define BUILD_NUMBER_STR "9"
-#define BUILD_NUMBER_INT 9
+#define BUILD_NUMBER_STR "10"
+#define BUILD_NUMBER_INT 10
 
 #define FULL_VERSION_STR                                                                 \
   MAJOR_VERSION_STR "." SUB_VERSION_STR "." RELEASE_NUMBER_STR "." BUILD_NUMBER_STR

diff --git a/BasicLimiterAutoMake/source/dsp/limiter.hpp b/BasicLimiterAutoMake/source/dsp/limiter.hpp
@@ -35,7 +35,7 @@ template<typename Sample> class IntDelay {
 
   void resize(size_t size)
   {
-    buf.resize(size);
+    buf.resize(size + 1);
     wptr = 0;
     rptr = 0;
   }

diff --git a/BasicLimiterAutoMake/source/version.hpp b/BasicLimiterAutoMake/source/version.hpp
@@ -29,11 +29,11 @@
 #define SUB_VERSION_STR "1"
 #define SUB_VERSION_INT 1
 
-#define RELEASE_NUMBER_STR "8"
-#define RELEASE_NUMBER_INT 8
+#define RELEASE_NUMBER_STR "9"
+#define RELEASE_NUMBER_INT 9
 
-#define BUILD_NUMBER_STR "10"
-#define BUILD_NUMBER_INT 10
+#define BUILD_NUMBER_STR "11"
+#define BUILD_NUMBER_INT 11
 
 #define FULL_VERSION_STR                                                                 \
   MAJOR_VERSION_STR "." SUB_VERSION_STR "." RELEASE_NUMBER_STR "." BUILD_NUMBER_STR

diff --git a/ParallelComb/source/dsp/dspcore.cpp b/ParallelComb/source/dsp/dspcore.cpp
@@ -37,7 +37,7 @@
 
 constexpr float feedbackLimiterAttackSeconds = 64.0f / 48000.0f;
 
-template<typename T> T lerp(T a, T b, T t) { return a + t * (b - a); }
+template<typename T> inline T lerp(T a, T b, T t) { return a + t * (b - a); }
 
 void DSPCORE_NAME::setup(double sampleRate)
 {

diff --git a/ParallelComb/source/dsp/parallelcomb.hpp b/ParallelComb/source/dsp/parallelcomb.hpp
@@ -104,6 +104,8 @@ template<typename Sample, size_t nTap> class ParallelComb {
 public:
   ParallelCombSmoother<Sample, nTap> time;
 
+  ParallelComb() : buf(4) {}
+
   void setup(Sample sampleRate, Sample maxTime)
   {
     auto &&size = size_t(sampleRate * maxTime) + 1;

diff --git a/ParallelComb/source/version.hpp b/ParallelComb/source/version.hpp
@@ -29,11 +29,11 @@
 #define SUB_VERSION_STR "2"
 #define SUB_VERSION_INT 2
 
-#define RELEASE_NUMBER_STR "0"
-#define RELEASE_NUMBER_INT 0
+#define RELEASE_NUMBER_STR "1"
+#define RELEASE_NUMBER_INT 1
 
-#define BUILD_NUMBER_STR "1"
-#define BUILD_NUMBER_INT 1
+#define BUILD_NUMBER_STR "2"
+#define BUILD_NUMBER_INT 2
 
 #define FULL_VERSION_STR                                                                 \
   MAJOR_VERSION_STR "." SUB_VERSION_STR "." RELEASE_NUMBER_STR "." BUILD_NUMBER_STR

diff --git a/common/dsp/basiclimiter.hpp b/common/dsp/basiclimiter.hpp
@@ -37,7 +37,7 @@ template<typename Sample> class IntDelay {
 
   void resize(size_t size)
   {
-    buf.resize(size);
+    buf.resize(size + 1);
     wptr = 0;
     rptr = 0;
   }
@@ -48,15 +48,15 @@ template<typename Sample> class IntDelay {
   {
     if (delayFrames >= buf.size()) delayFrames = buf.size();
     rptr = wptr - delayFrames;
-    if (rptr >= buf.size()) rptr += buf.size(); // Unsigned overflow case.
+    if (rptr >= buf.size()) rptr += buf.size(); // Unsigned negative overflow case.
   }
 
   Sample process(Sample input)
   {
-    if (++wptr >= buf.size()) wptr -= buf.size();
+    if (++wptr >= buf.size()) wptr = 0;
     buf[wptr] = input;
 
-    if (++rptr >= buf.size()) rptr -= buf.size();
+    if (++rptr >= buf.size()) rptr = 0;
     return buf[rptr];
   }
 };