One less ringbuffer

Signed-off-by: falkTX <falktx@falktx.com>

Author: falkTX

Makefile

@@ -26,10 +26,11 @@ endif
 # ---------------------------------------------------------------------------------------------------------------------
 # auto-download model files
 
-models: deps/rnnoise/src/rnnoise_data.h
+models:
+# deps/rnnoise/src/rnnoise_data.h
 
-deps/rnnoise/src/rnnoise_data.h:
-	cd deps/rnnoise && sh download_model.sh
+# deps/rnnoise/src/rnnoise_data.h:
+# 	cd deps/rnnoise && sh download_model.sh
 
 # ---------------------------------------------------------------------------------------------------------------------
 

src/PluginDSP.cpp

@@ -7,6 +7,8 @@
 #include "DistrhoPlugin.hpp"
 #include "extra/RingBuffer.hpp"
 
+#include <cassert>
+
 #include "rnnoise.h"
 
 START_NAMESPACE_DISTRHO
@@ -22,9 +24,9 @@ class ReNooicePlugin : public Plugin
     float* const bufferIn = new float[denoiseFrameSize];
     float* const bufferOut = new float[denoiseFrameSize];
 
-    HeapRingBuffer ringBufferIn;
     HeapRingBuffer ringBufferOut;
 
+    uint32_t bufferInPos = 0;
     bool processing = false;
 
     enum Parameters {
@@ -141,35 +143,18 @@ class ReNooicePlugin : public Plugin
 
     void activate() override
     {
-        const uint32_t ringBufferSize = denoiseFrameSize * 3 * sizeof(float);
-        ringBufferIn.createBuffer(ringBufferSize);
+        const uint32_t ringBufferSize = denoiseFrameSize * 2 * sizeof(float);
         ringBufferOut.createBuffer(ringBufferSize);
-        processing = false;
         parameters[kParamCurVAD] = parameters[kParamMaxVAD] = 0.f;
+        processing = false;
+        bufferInPos = 0;
     }
 
     void deactivate() override
     {
-        ringBufferIn.deleteBuffer();
         ringBufferOut.deleteBuffer();
     }
 
-    void runDenoise()
-    {
-        // extract input data from ringbuffer
-        ringBufferIn.readCustomData(bufferIn, denoiseFrameSize * sizeof(float));
-
-        // run denoise
-        parameters[kParamCurVAD] = rnnoise_process_frame(denoise, bufferOut, bufferIn);
-
-        if (parameters[kParamCurVAD] > parameters[kParamMaxVAD])
-            parameters[kParamMaxVAD] = parameters[kParamCurVAD];
-
-        // write denoise output into ringbuffer
-        ringBufferOut.writeCustomData(bufferOut, denoiseFrameSize * sizeof(float));
-        ringBufferOut.commitWrite();
-    }
-
    /**
       Run/process function for plugins without MIDI input.
       @note Some parameters might be null if there are no audio inputs or outputs.
@@ -181,22 +166,36 @@ class ReNooicePlugin : public Plugin
 
         for (uint32_t offset = 0; offset != frames;)
         {
-            const uint32_t framesCycle = std::min(denoiseFrameSize, frames - offset);
+            const uint32_t framesCycle = std::min(denoiseFrameSize - bufferInPos, frames - offset);
+
+            // copy input data into buffer
+            std::memcpy(bufferIn + bufferInPos, input + offset, framesCycle * sizeof(float));
 
-            // write input data into ringbuffer
-            ringBufferIn.writeCustomData(input + offset, framesCycle * sizeof(float));
-            ringBufferIn.commitWrite();
+            bufferInPos += framesCycle;
+            assert(bufferInPos <= denoiseFrameSize);
+
+            // run denoise once input buffer is full
+            if (bufferInPos == denoiseFrameSize)
+            {
+                bufferInPos = 0;
 
-            if (ringBufferIn.getReadableDataSize() / sizeof(float) >= denoiseFrameSize)
-                runDenoise();
+                parameters[kParamCurVAD] = rnnoise_process_frame(denoise, bufferOut, bufferIn);
+
+                if (parameters[kParamCurVAD] > parameters[kParamMaxVAD])
+                    parameters[kParamMaxVAD] = parameters[kParamCurVAD];
+
+                // write denoise output into ringbuffer
+                ringBufferOut.writeCustomData(bufferOut, denoiseFrameSize * sizeof(float));
+                ringBufferOut.commitWrite();
+            }
 
             if (processing)
             {
                 ringBufferOut.readCustomData(output + offset, framesCycle * sizeof(float));
             }
             else
             {
-                std::memset(output + offset, 0, sizeof(float) * framesCycle);
+                std::memset(output + offset, 0, framesCycle * sizeof(float));
 
                 if (ringBufferOut.getReadableDataSize() / sizeof(float) >= denoiseFrameSize)
                     processing = true;