Optimize plugin-processing for non-automated params

[ardour.git] / libs / ardour / ardour / dsp_load_calculator.h

diff --git a/libs/ardour/ardour/dsp_load_calculator.h b/libs/ardour/ardour/dsp_load_calculator.h
index c7f8e2a2e02402055561e46f2d574aed5b1c699d..88b327bb300ef8ab85853df680d900aca92248aa 100644 (file)
--- a/libs/ardour/ardour/dsp_load_calculator.h
+++ b/libs/ardour/ardour/dsp_load_calculator.h
@@ -19,6 +19,7 @@
 #ifndef ARDOUR_DSP_LOAD_CALCULATOR_H
 #define ARDOUR_DSP_LOAD_CALCULATOR_H
 
+#include <stdlib.h>
 #include <stdint.h>
 #include <cassert>
 #include <algorithm>
@@ -37,7 +38,7 @@ public:
        }
 
        void set_max_time(double samplerate, uint32_t period_size) {
-               m_max_time_us = (1e6 / samplerate) * period_size;
+               m_max_time_us = period_size * 1e6 / samplerate;
        }
 
        void set_max_time_us(uint64_t max_time_us) {
@@ -68,16 +69,19 @@ public:
                        return;
                }
 
-               if (elapsed_time_us() > m_max_time_us) {
-                       m_dsp_load = 1.0f;
+#ifndef NDEBUG
+               const bool calc_avg_load = NULL != getenv("AVGLOAD");
+#else
+               const bool calc_avg_load = false;
+#endif
+
+               const float load = (float) elapsed_time_us() / (float)m_max_time_us;
+               if ((calc_avg_load && load > .95f) || (!calc_avg_load && (load > m_dsp_load || load > 1.f))) {
+                       m_dsp_load = load;
                } else {
-                       const float load = elapsed_time_us() / (float)m_max_time_us;
-                       if (load > m_dsp_load) {
-                               m_dsp_load = load;
-                       } else {
-                               const float alpha = 0.2f * (m_max_time_us * 1e-6f);
-                               m_dsp_load = m_dsp_load + alpha * (load - m_dsp_load) + 1e-12;
-                       }
+                       const float alpha = 0.2f * (m_max_time_us * 1e-6f);
+                       m_dsp_load = std::min (1.f, m_dsp_load);
+                       m_dsp_load += alpha * (load - m_dsp_load) + 1e-12;
                }
        }