godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2026-01-06 10:11:57 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #78013 from Calinou/cli-add-audio-output-latency-argument

Browse Source 
Add a `--audio-output-latency` command-line argument
This commit is contained in:
Rémi Verschelde
2023-08-17 15:43:14 +02:00
parent ed8b92a02f 6f1152bdbe
commit 1537452aa9
17 changed files with 46 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/alsa/audio_driver_alsa.cpp
View File

@@ -111,7 +111,7 @@ Error AudioDriverALSA::init_output_device() {
// In ALSA the period size seems to be the one that will determine the actual latency
// Ref: https://www.alsa-project.org/main/index.php/FramesPeriods
unsigned int periods = 2;
int latency = GLOBAL_GET("audio/driver/output_latency");
int latency = Engine::get_singleton()->get_audio_output_latency();
buffer_frames = closest_power_of_2(latency * mix_rate / 1000);
buffer_size = buffer_frames * periods;
period_size = buffer_frames;

2
drivers/coreaudio/audio_driver_coreaudio.cpp
View File

@@ -131,7 +131,7 @@ Error AudioDriverCoreAudio::init() {
result = AudioUnitSetProperty(audio_unit, kAudioUnitProperty_StreamFormat, kAudioUnitScope_Input, kOutputBus, &strdesc, sizeof(strdesc));
ERR_FAIL_COND_V(result != noErr, FAILED);
int latency = GLOBAL_GET("audio/driver/output_latency");
int latency = Engine::get_singleton()->get_audio_output_latency();
// Sample rate is independent of channels (ref: https://stackoverflow.com/questions/11048825/audio-sample-frequency-rely-on-channels)
buffer_frames = closest_power_of_2(latency * mix_rate / 1000);

2
drivers/pulseaudio/audio_driver_pulseaudio.cpp
View File

@@ -222,7 +222,7 @@ Error AudioDriverPulseAudio::init_output_device() {
break;
}
int tmp_latency = GLOBAL_GET("audio/driver/output_latency");
int tmp_latency = Engine::get_singleton()->get_audio_output_latency();
buffer_frames = closest_power_of_2(tmp_latency * mix_rate / 1000);
pa_buffer_size = buffer_frames * pa_map.channels;

2
drivers/wasapi/audio_driver_wasapi.cpp
View File

@@ -555,7 +555,7 @@ Error AudioDriverWASAPI::finish_input_device() {
Error AudioDriverWASAPI::init() {
mix_rate = _get_configured_mix_rate();
target_latency_ms = GLOBAL_GET("audio/driver/output_latency");
target_latency_ms = Engine::get_singleton()->get_audio_output_latency();
Error err = init_output_device();
if (err != OK) {

2
drivers/xaudio2/audio_driver_xaudio2.cpp
View File

@@ -45,7 +45,7 @@ Error AudioDriverXAudio2::init() {
speaker_mode = SPEAKER_MODE_STEREO;
channels = 2;
int latency = GLOBAL_GET("audio/driver/output_latency");
int latency = Engine::get_singleton()->get_audio_output_latency();
buffer_size = closest_power_of_2(latency * mix_rate / 1000);
samples_in = memnew_arr(int32_t, buffer_size * channels);