diff options
| author | Robin Gareus <robin@gareus.org> | 2015-09-16 17:36:01 +0200 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2015-09-16 18:24:57 +0200 |
| commit | 1c43383e9238121849f6b317052ed9fe5b908526 (patch) | |
| tree | 0c25ff6a22dfcd5f2af0303b04a52c3a5f7fbbd6 /libs/backends | |
| parent | e125c7807027b31e2fd2fb48ea117bb769c5f678 (diff) | |
CoreAudio: use libardour provided DSP load calc.
Diffstat (limited to 'libs/backends')
| -rw-r--r-- | libs/backends/coreaudio/coreaudio_backend.cc | 18 | ||||
| -rw-r--r-- | libs/backends/coreaudio/coreaudio_backend.h | 2 |
2 files changed, 8 insertions, 12 deletions
diff --git a/libs/backends/coreaudio/coreaudio_backend.cc b/libs/backends/coreaudio/coreaudio_backend.cc index 6047b8002e..d125f0486c 100644 --- a/libs/backends/coreaudio/coreaudio_backend.cc +++ b/libs/backends/coreaudio/coreaudio_backend.cc @@ -701,7 +701,7 @@ CoreAudioBackend::freewheel (bool onoff) float CoreAudioBackend::dsp_load () const { - return std::min(100.f, 100.f * _dsp_load); + return 100.f * _dsp_load; } size_t @@ -1718,7 +1718,7 @@ int CoreAudioBackend::process_callback (const uint32_t n_samples, const uint64_t host_time) { uint32_t i = 0; - uint64_t clock1, clock2; + uint64_t clock1; _active_ca = true; @@ -1846,16 +1846,10 @@ CoreAudioBackend::process_callback (const uint32_t n_samples, const uint64_t hos _processed_samples += n_samples; /* calc DSP load. */ - clock2 = g_get_monotonic_time(); - const int64_t elapsed_time = clock2 - clock1; - // low pass filter - const float load = elapsed_time / (float) nominal_time; - if (load > _dsp_load) { - _dsp_load = load; - } else { - const float a = .2 * _samples_per_period / _samplerate; - _dsp_load = _dsp_load + a * (load - _dsp_load) + 1e-12; - } + _dsp_load_calc.set_max_time (_samplerate, _samples_per_period); + _dsp_load_calc.set_start_timestamp_us (clock1); + _dsp_load_calc.set_stop_timestamp_us (g_get_monotonic_time()); + _dsp_load = _dsp_load_calc.get_dsp_load (); pthread_mutex_unlock (&_process_callback_mutex); return 0; diff --git a/libs/backends/coreaudio/coreaudio_backend.h b/libs/backends/coreaudio/coreaudio_backend.h index 55aaf47389..c4cbed91d5 100644 --- a/libs/backends/coreaudio/coreaudio_backend.h +++ b/libs/backends/coreaudio/coreaudio_backend.h @@ -31,6 +31,7 @@ #include <boost/shared_ptr.hpp> #include "ardour/audio_backend.h" +#include "ardour/dsp_load_calculator.h" #include "ardour/types.h" #include "coreaudio_pcmio.h" @@ -371,6 +372,7 @@ class CoreAudioBackend : public AudioBackend { /* processing */ float _dsp_load; + ARDOUR::DSPLoadCalculator _dsp_load_calc; uint64_t _processed_samples; pthread_t _main_thread; |