smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-08 15:54:57 +01:00
Code Issues Projects Releases Wiki Activity

Use ARDOUR::DSPLoadCalculator in DummyBackend

Browse source
This commit is contained in:
Tim Mayberry 2015-09-14 21:04:27 +10:00
parent 305f1d73bb
commit faa38a0d29
2 changed files with 10 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

37
libs/backends/dummy/dummy_audiobackend.cc
View file

@ -447,6 +447,8 @@ DummyAudioBackend::_start (bool /*for_latency_measurement*/)
engine.sample_rate_change (_samplerate); engine.sample_rate_change (_samplerate);
engine.buffer_size_change (_samples_per_period); engine.buffer_size_change (_samples_per_period);
_dsp_load_calc.set_max_time (_samplerate, _samples_per_period);
if (engine.reestablish_ports ()) { if (engine.reestablish_ports ()) {
PBD::error << _("DummyAudioBackend: Could not re-establish ports.") << endmsg; PBD::error << _("DummyAudioBackend: Could not re-establish ports.") << endmsg;
stop (); stop ();
@ -1213,7 +1215,7 @@ DummyAudioBackend::main_process_thread ()
manager.registration_callback(); manager.registration_callback();
manager.graph_order_callback(); manager.graph_order_callback();
int64_t clock1, clock2; int64_t clock1;
clock1 = -1; clock1 = -1;
while (_running) { while (_running) {
@ -1264,35 +1266,12 @@ DummyAudioBackend::main_process_thread ()
} }
if (!_freewheel) { if (!_freewheel) {
const int64_t nominal_time = 1e6 * _samples_per_period / _samplerate; _dsp_load_calc.set_start_timestamp_us (clock1);
clock2 = _x_get_monotonic_usec(); _dsp_load_calc.set_stop_timestamp_us (_x_get_monotonic_usec());
bool timers_ok = true; _dsp_load = _dsp_load_calc.get_dsp_load ();
/* querying the performance counter can fail occasionally (-1).
* Also on some multi-core systems, timers are CPU specific and not
* synchronized. We assume they differ more than a few milliseconds
* (4 * nominal cycle time) and simply ignore cases where the
* execution switches cores.
*/
if (clock1 < 0 || clock2 < 0 || (clock1 > clock2) || (clock2 - clock1) > 4 * nominal_time) {
clock1 = 0;
clock2 = nominal_time;
timers_ok = false;
}
const int64_t elapsed_time = clock2 - clock1;
if (timers_ok)
{ // 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;
}
}
const int64_t elapsed_time = _dsp_load_calc.elapsed_time_us ();
const int64_t nominal_time = _dsp_load_calc.get_max_time_us ();
if (elapsed_time < nominal_time) { if (elapsed_time < nominal_time) {
const int64_t sleepy = _speedup * (nominal_time - elapsed_time); const int64_t sleepy = _speedup * (nominal_time - elapsed_time);
Glib::usleep (std::max ((int64_t) 100, sleepy)); Glib::usleep (std::max ((int64_t) 100, sleepy));

2
libs/backends/dummy/dummy_audiobackend.h
View file

@ -32,6 +32,7 @@
#include "ardour/types.h" #include "ardour/types.h"
#include "ardour/audio_backend.h" #include "ardour/audio_backend.h"
#include "ardour/dsp_load_calculator.h"
namespace ARDOUR { namespace ARDOUR {
@ -401,6 +402,7 @@ class DummyAudioBackend : public AudioBackend {
float _samplerate; float _samplerate;
size_t _samples_per_period; size_t _samples_per_period;
float _dsp_load; float _dsp_load;
DSPLoadCalculator _dsp_load_calc;
static size_t _max_buffer_size; static size_t _max_buffer_size;
uint32_t _n_inputs; uint32_t _n_inputs;