ardour/livetrax
13
0
Fork 0
Code

CoreAudio: unconditionally apply device latency

Browse Source
This commit is contained in:
Robin Gareus 2023-06-21 23:54:55 +02:00
parent 877a2f3611
commit 341cd455d8
Signed by: rgareus
GPG Key ID: A090BCE02CF57F04
2 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
libs/backends/coreaudio/coreaudio_backend.cc
View File

@ -112,6 +112,8 @@ CoreAudioBackend::CoreAudioBackend (AudioEngine& e, AudioBackendInfo& info)
, _n_outputs (0)
, _systemic_audio_input_latency (0)
, _systemic_audio_output_latency (0)
, _hw_audio_input_latency (0)
, _hw_audio_output_latency (0)
, _dsp_load (0)
, _processed_samples (0)
{
@ -451,6 +453,7 @@ CoreAudioBackend::systemic_output_latency () const
uint32_t
CoreAudioBackend::systemic_hw_input_latency () const
{
return 0;
if (name_to_id (_input_audio_device) != UINT32_MAX) {
return _pcmio->get_latency(name_to_id(_input_audio_device, Input), true);
}
@ -460,6 +463,7 @@ CoreAudioBackend::systemic_hw_input_latency () const
uint32_t
CoreAudioBackend::systemic_hw_output_latency () const
{
return 0;
if (name_to_id (_output_audio_device) != UINT32_MAX) {
return _pcmio->get_latency(name_to_id(_output_audio_device, Output), false);
}
@ -642,6 +646,16 @@ CoreAudioBackend::_start (bool for_latency_measurement)
PBD::warning << _("CoreAudioBackend: sample rate does not match.") << endmsg;
}
_hw_audio_input_latency = _hw_audio_output_latency = 0;
if (device1 != UINT32_MAX) {
_hw_audio_input_latency = _pcmio->get_latency(device1, true);
}
if (device2 != UINT32_MAX) {
_hw_audio_output_latency = _pcmio->get_latency(device2, false);
}
_measure_latency = for_latency_measurement;
_preinit = true;
@ -1244,12 +1258,12 @@ CoreAudioBackend::get_latency_range (PortEngine::PortHandle port_handle, bool fo
r = port->latency_range (for_playback);
if (port->is_physical() && port->is_terminal() && port->type() == DataType::AUDIO) {
if (port->is_input() && for_playback) {
r.min += _samples_per_period;
r.max += _samples_per_period;
r.min += _samples_per_period + _hw_audio_input_latency;
r.max += _samples_per_period + _hw_audio_input_latency;
}
if (port->is_output() && !for_playback) {
r.min += _samples_per_period;
r.max += _samples_per_period;
r.min += _samples_per_period + _hw_audio_output_latency;
r.max += _samples_per_period + _hw_audio_output_latency;
}
}
return r;

3
libs/backends/coreaudio/coreaudio_backend.h
View File

@ -368,6 +368,9 @@ class CoreAudioBackend : public AudioBackend, public PortEngineSharedImpl {
uint32_t _systemic_audio_input_latency;
uint32_t _systemic_audio_output_latency;
uint32_t _hw_audio_input_latency;
uint32_t _hw_audio_output_latency;
/* coreaudio specific */
enum DeviceFilter { All, Input, Output, Duplex };
uint32_t name_to_id(std::string, DeviceFilter filter = All) const;