diff options
| author | Tim Mayberry <mojofunk@gmail.com> | 2015-09-11 23:07:01 +1000 |
|---|---|---|
| committer | Tim Mayberry <mojofunk@gmail.com> | 2015-09-16 11:22:16 +1000 |
| commit | f5e7aa11f9a601e400dbe859ccafc94c275cb885 (patch) | |
| tree | 75be52c9fd390621fb91352083071717db5521f0 /libs/ardour/ardour/dsp_load_calculator.h | |
| parent | cf88bbc472cb7b62c326b955dff1b962b0d02fee (diff) | |
Use same algorithm as CA and ALSA backends in DSPLoadCalculation
Stop using an averaging of the values until we can establish whether it is
really necessary.
Diffstat (limited to 'libs/ardour/ardour/dsp_load_calculator.h')
| -rw-r--r-- | libs/ardour/ardour/dsp_load_calculator.h | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/libs/ardour/ardour/dsp_load_calculator.h b/libs/ardour/ardour/dsp_load_calculator.h index f3c5fea227..42386e2cb0 100644 --- a/libs/ardour/ardour/dsp_load_calculator.h +++ b/libs/ardour/ardour/dsp_load_calculator.h @@ -23,8 +23,6 @@ #include <cassert> #include <algorithm> -#include <pbd/ringbuffer.h> - #include "ardour/libardour_visibility.h" namespace ARDOUR { @@ -36,8 +34,6 @@ public: , m_start_timestamp_us(0) , m_stop_timestamp_us(0) , m_dsp_load(0) - , m_value_history (max_value_history()) - , m_num_values(0) { } @@ -45,17 +41,8 @@ public: void set_max_time_us(uint64_t max_time_us) { assert(max_time_us != 0); m_max_time_us = max_time_us; - - // Use average of last 1/4 second of values so responsiveness - // remains consistent independent of max time - uint32_t max_dsp_samples_per_qtr_second = (250000 / m_max_time_us); - m_num_values = - std::min(max_value_history() - 1, max_dsp_samples_per_qtr_second); - - m_value_history.reset(); } - int64_t get_max_time_us() const { return m_max_time_us; } void set_start_timestamp_us(int64_t start_timestamp_us) @@ -85,9 +72,8 @@ public: } return m_dsp_load; } -private: // methods - static uint32_t max_value_history () { return 16; } +private: // methods int64_t max_timer_error () { return 4 * m_max_time_us; } private: // data @@ -95,8 +81,6 @@ private: // data int64_t m_start_timestamp_us; int64_t m_stop_timestamp_us; float m_dsp_load; - RingBuffer<float> m_value_history; - uint32_t m_num_values; }; } // namespace ARDOUR |