gitea/SDL3_fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

coreaudio: Fixed assertion when device fails/quits mid-iteration.

Browse Source 
Fixes #8094.
This commit is contained in:
Ryan C. Gordon
2023-08-08 23:56:17 -04:00
parent 1022fd6e04
commit 5735d2b03b
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/audio/coreaudio/SDL_coreaudio.m
View File

@@ -550,8 +550,16 @@ static void OutputBufferReadyCallback(void *inUserData, AudioQueueRef inAQ, Audi
SDL_assert(inBuffer != NULL); // ...right? SDL_assert(inBuffer != NULL); // ...right?
SDL_assert(device->hidden->current_buffer == NULL); // shouldn't have anything pending SDL_assert(device->hidden->current_buffer == NULL); // shouldn't have anything pending
device->hidden->current_buffer = inBuffer; device->hidden->current_buffer = inBuffer;
SDL_OutputAudioThreadIterate(device); const SDL_bool okay = SDL_OutputAudioThreadIterate(device);
SDL_assert(device->hidden->current_buffer == NULL); // PlayDevice should have enqueued and cleaned it out. SDL_assert((device->hidden->current_buffer == NULL) || !okay); // PlayDevice should have enqueued and cleaned it out, unless we failed or shutdown.
// buffer is unexpectedly here? We're probably dying, but try to requeue this buffer with silence.
if (device->hidden->current_buffer) {
AudioQueueBufferRef current_buffer = device->hidden->current_buffer;
device->hidden->current_buffer = NULL;
SDL_memset(current_buffer->mAudioData, device->silence_value, (size_t) current_buffer->mAudioDataBytesCapacity);
AudioQueueEnqueueBuffer(device->hidden->audioQueue, current_buffer, 0, NULL);
}
} }
static int COREAUDIO_CaptureFromDevice(SDL_AudioDevice *device, void *buffer, int buflen) static int COREAUDIO_CaptureFromDevice(SDL_AudioDevice *device, void *buffer, int buflen)