comparison flattendynamics-ladspa.cpp @ 8:355fb9ea3888

Global-only version that performs reasonably well

     m_sumOfSquaresLongTerm(0.f),
     m_sumOfSquaresShortTerm(0.f),
     m_rmsLongTerm(0.f),
     m_rmsShortTerm(0.f),
     m_maxRmsLongTerm(0.f),
+    m_maxRmsShortTerm(0.f),
     m_gain(1.f)
 {
     reset();
 }
 

     m_sumOfSquaresLongTerm = 0.0;
     m_sumOfSquaresShortTerm = 0.0;
     m_rmsLongTerm = 0.f;
     m_rmsShortTerm = 0.f;
     m_maxRmsLongTerm = 0.f;
+    m_maxRmsShortTerm = 0.f;
     m_gain = 1.f;
 }
 
 void
 FlattenDynamics::updateParameters()

 
     if (m_rmsLongTerm > m_maxRmsLongTerm) {
         m_maxRmsLongTerm = m_rmsLongTerm;
     }
 
+    if (m_rmsShortTerm > m_maxRmsShortTerm) {
+        m_maxRmsShortTerm = m_rmsShortTerm;
+    }
+
+    float fixedGain = targetMaxRMS / m_maxRmsShortTerm;
+
+    float targetGain = fixedGain;
+
+/*
+
     float frac = m_rmsShortTerm / m_maxRmsLongTerm;
     
     // push up toward top of 0,1 range
     frac = pow(frac, 0.5);
 
     float targetRMS = targetMaxRMS * frac;
     float targetGain = targetRMS / m_rmsShortTerm;
+*/
+
     if (targetGain > maxGain) {
         targetGain = maxGain;
     }
 
     float catchUpSamples = catchUpSeconds * m_sampleRate;