godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #89283 from AlexOtsuka/audio-fix 

Fix audio crackling issues due to incorrect WASAPI buffer size
This commit is contained in:
Rémi Verschelde 2024-03-09 00:52:26 +01:00
parent d6a9a70101 179b0786c6
commit 377ce78d4e
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/wasapi/audio_driver_wasapi.cpp
View File

@ -737,12 +737,17 @@ void AudioDriverWASAPI::thread_func(void *p_udata) {
ad->start_counting_ticks(); ad->start_counting_ticks();
if (avail_frames > 0 && ad->audio_output.audio_client) { if (avail_frames > 0 && ad->audio_output.audio_client) {
UINT32 buffer_size;
UINT32 cur_frames; UINT32 cur_frames;
bool invalidated = false; bool invalidated = false;
HRESULT hr = ad->audio_output.audio_client->GetCurrentPadding(&cur_frames); HRESULT hr = ad->audio_output.audio_client->GetBufferSize(&buffer_size);
if (hr != S_OK) {
ERR_PRINT("WASAPI: GetBufferSize error");
}
hr = ad->audio_output.audio_client->GetCurrentPadding(&cur_frames);
if (hr == S_OK) { if (hr == S_OK) {
// Check how much frames are available on the WASAPI buffer // Check how much frames are available on the WASAPI buffer
UINT32 write_frames = MIN(ad->buffer_frames - cur_frames, avail_frames); UINT32 write_frames = MIN(buffer_size - cur_frames, avail_frames);
if (write_frames > 0) { if (write_frames > 0) {
BYTE *buffer = nullptr; BYTE *buffer = nullptr;
hr = ad->audio_output.render_client->GetBuffer(write_frames, &buffer); hr = ad->audio_output.render_client->GetBuffer(write_frames, &buffer);