Fix stereo enhancement crash issue; add missing mutex lock

Author: timschneeb

libjamesdsp/subtree/Main/libjamesdsp/jni/jamesdsp/jdsp/Effects/stereoEnhancement.c

@@ -9,6 +9,7 @@ void analysisWarpedPFBStereo(WarpedPFB *pfb1, WarpedPFB *pfb2, float *x1, float
 void synthesisWarpedPFBStereo(WarpedPFB *pfb1, WarpedPFB *pfb2, float *y1, float *y2);
 void StereoEnhancementSetParam(JamesDSPLib *jdsp, float mix)
 {
+    jdsp_lock(jdsp);
 	jdsp->sterEnh.mix = mix;
 	jdsp->sterEnh.minusMix = 1.0f - jdsp->sterEnh.mix;
 	if (jdsp->sterEnh.mix > 0.5f)
@@ -36,17 +37,22 @@ void StereoEnhancementSetParam(JamesDSPLib *jdsp, float mix)
 	float ms = 0.75f; // 0.75 ms
 	for (unsigned int i = 0; i < 5; i++)
 		jdsp->sterEnh.emaAlpha[i] = 1.0f - powf(10.0f, (log10f(0.5f) / (ms / 1000.0f) / (jdsp->fs / (float)Sk[i])));
+    jdsp_unlock(jdsp);
 }
 void StereoEnhancementConstructor(JamesDSPLib *jdsp)
 {
+    jdsp_lock(jdsp);
 	jdsp->sterEnh.subband[1] = jdsp->sterEnh.subband[0] = 0;
+    jdsp_unlock(jdsp);
 }
 void StereoEnhancementDestructor(JamesDSPLib *jdsp)
 {
+    jdsp_lock(jdsp);
 	if (jdsp->sterEnh.subband[0])
 		free(jdsp->sterEnh.subband[0]);
 	if (jdsp->sterEnh.subband[1])
 		free(jdsp->sterEnh.subband[1]);
+    jdsp_unlock(jdsp);
 }
 void StereoEnhancementEnable(JamesDSPLib *jdsp)
 {
@@ -88,4 +94,4 @@ void StereoEnhancementProcess(JamesDSPLib *jdsp, size_t n)
 		jdsp->tmpBuffer[0][i] = y1 * snh->gain;
 		jdsp->tmpBuffer[1][i] = y2 * snh->gain;
 	}
-}
+}

src/audio/base/DspHost.cpp

@@ -52,7 +52,7 @@ inline void* GetStringForIndex(eel_string_context_state *st, float val, int32_t
         return (void*)&st->m_literal_strings[idx];
 }
 
-DspHost::DspHost(void* dspPtr, MessageHandlerFunc&& extraHandler) : _extraFunc(std::move(extraHandler)), _stereoWideDebounce(new QTimer())
+DspHost::DspHost(void* dspPtr, MessageHandlerFunc&& extraHandler) : _extraFunc(std::move(extraHandler))
 {
     auto dsp = static_cast<JamesDSPLib*>(dspPtr);
     if(!dsp)
@@ -70,23 +70,10 @@ DspHost::DspHost(void* dspPtr, MessageHandlerFunc&& extraHandler) : _extraFunc(s
 
     _dsp = dsp;
     _cache = new DspConfig();
-
-
-    /* Workaround: calling StereoEnhancementSetParam while processing has a small chance of causing a crash inside analysisWarpedPFBStereo
-     *             due to the possiblity that snh->subband[x] is accessed before initWarpedPFB or assignPtrWarpedPFB is called by StereoEnhancementSetParam
-                      -> pausing processing not easily doable (in time); reduce strain on StereoEnhancementSetParam instead */
-    /* TODO: replace workaround with proper patch */
-    _stereoWideDebounce->setInterval(750);
-    _stereoWideDebounce->setSingleShot(true);
-    QObject::connect(_stereoWideDebounce, &QTimer::timeout, [this]{
-        util::debug("-> Timer finished!");
-        StereoEnhancementSetParam(cast(this->_dsp), _cache->get<float>(DspConfig::stereowide_level) / 100.0f);
-    });
 }
 
 DspHost::~DspHost()
 {
-    _stereoWideDebounce->deleteLater();
     setStdOutHandler(NULL, NULL);
 }
 
@@ -597,28 +584,14 @@ bool DspHost::update(DspConfig *config, bool ignoreCache)
             else
                 StereoEnhancementDisable(cast(this->_dsp));
             break;
-        case DspConfig::stereowide_level: {
-            _stereoWideClock.tock();
-            auto duration = _stereoWideClock.duration();
-            _stereoWideClock.tick();
-            util::debug(std::to_string(duration.count()));
-
-            if(duration.count() > 750 && !_stereoWideDebounce->isActive())
-            {
-                util::debug("StereoEnhancementSetParam");
-                StereoEnhancementSetParam(cast(this->_dsp), _cache->get<float>(DspConfig::stereowide_level) / 100.0f);
-            }
-            else if(!_stereoWideDebounce->isActive())
+        case DspConfig::stereowide_level:
+            StereoEnhancementDisable(cast(this->_dsp));
+            StereoEnhancementSetParam(cast(this->_dsp), _cache->get<float>(DspConfig::stereowide_level) / 100.0f);
+            if(config->get<bool>(DspConfig::stereowide_enable))
             {
-                util::debug("Timer start!");
-                _stereoWideDebounce->start();
-            }
-            else
-            {
-                util::debug("Timer already running!");
+                StereoEnhancementEnable(cast(this->_dsp));
             }
             break;
-        }
         case DspConfig::tone_enable:
             if(current.toBool())
                 FIREqualizerEnable(cast(this->_dsp));

src/audio/base/DspHost.h

@@ -5,7 +5,6 @@
 #include <any>
 #include <list>
 #include <memory>
-#include <chrono>
 
 #include "EelVariable.h"
 #include "Utils.h"
@@ -46,8 +45,6 @@ class DspHost
        due to #defines and other global definitons that may conflict */
     void* _dsp; // JamesDSPLib*
     DspConfig* _cache;
-    ClockMeasure<std::chrono::milliseconds, std::chrono::steady_clock> _stereoWideClock;
-    QTimer* _stereoWideDebounce;
 
     void updateLimiter(DspConfig *config);
     void updateFirEqualizer(DspConfig *config);

src/audio/base/Utils.h

@@ -7,27 +7,6 @@
 #include <map>
 #include <chrono>
 
-template <class DT = std::chrono::milliseconds,
-          class ClockT = std::chrono::steady_clock>
-class ClockMeasure
-{
-    using timep_t = typename ClockT::time_point;
-    timep_t _start = {}, _end = {};
-
-public:
-    void tick() {
-        _end = timep_t{};
-        _start = ClockT::now();
-    }
-
-    void tock() { _end = ClockT::now(); }
-
-    template <class T = DT>
-    auto duration() const {
-        assert(_end != timep_t{} && "toc before reporting");
-        return std::chrono::duration_cast<T>(_end - _start);
-    }
-};
 namespace util {
 
 const float minimum_db_level = -100.0F;