mirrors/SDL
1
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2025-10-26 12:27:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

wasapi: A few tweaks to buffer management.

Browse Source 
These were previously applied, in a different form, in SDL2.

Reference Issue #8924.
This commit is contained in:
Ryan C. Gordon
2024-01-27 14:03:49 -05:00
parent e71e16950a
commit 7a7875c904
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/audio/wasapi/SDL_wasapi.c
View File

@@ -432,7 +432,11 @@ static Uint8 *WASAPI_GetDeviceBuf(SDL_AudioDevice *device, int *buffer_size)
BYTE *buffer = NULL; BYTE *buffer = NULL;
if (device->hidden->render) { if (device->hidden->render) {
if (WasapiFailed(device, IAudioRenderClient_GetBuffer(device->hidden->render, device->sample_frames, &buffer))) { const HRESULT ret = IAudioRenderClient_GetBuffer(device->hidden->render, device->sample_frames, &buffer);
if (ret == AUDCLNT_E_BUFFER_TOO_LARGE) {
SDL_assert(buffer == NULL);
*buffer_size = 0; // just go back to WaitDevice and try again after the hardware has consumed some more data.
} else if (WasapiFailed(device, ret)) {
SDL_assert(buffer == NULL); SDL_assert(buffer == NULL);
if (device->hidden->device_lost) { // just use an available buffer, we won't be playing it anyhow. if (device->hidden->device_lost) { // just use an available buffer, we won't be playing it anyhow.
*buffer_size = 0; // we'll recover during WaitDevice and try again. *buffer_size = 0; // we'll recover during WaitDevice and try again.
@@ -642,11 +646,16 @@ static int mgmtthrtask_PrepDevice(void *userdata)
return WIN_SetErrorFromHRESULT("WASAPI can't determine buffer size", ret); return WIN_SetErrorFromHRESULT("WASAPI can't determine buffer size", ret);
} }
/* Match the callback size to the period size to cut down on the number of // Match the callback size to the period size to cut down on the number of
interrupts waited for in each call to WaitDevice */ // interrupts waited for in each call to WaitDevice
const float period_millis = default_period / 10000.0f; const float period_millis = default_period / 10000.0f;
const float period_frames = period_millis * newspec.freq / 1000.0f; const float period_frames = period_millis * newspec.freq / 1000.0f;
const int new_sample_frames = (int) SDL_ceilf(period_frames); int new_sample_frames = (int) SDL_ceilf(period_frames);
// regardless of what we calculated for the period size, clamp it to the expected hardware buffer size.
if (new_sample_frames > (int) bufsize) {
new_sample_frames = (int) bufsize;
}
// Update the fragment size as size in bytes // Update the fragment size as size in bytes
if (SDL_AudioDeviceFormatChangedAlreadyLocked(device, &newspec, new_sample_frames) < 0) { if (SDL_AudioDeviceFormatChangedAlreadyLocked(device, &newspec, new_sample_frames) < 0) {