encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

coreaudio: Dispose of AudioQueue before waiting on the thread. 

Otherwise the thread might block for a long time (more than 10 seconds!).
It's not clear to me why this happens, or why its safe to do this with a
resource that's still in use, but we have, until recently, always
disposed of the AudioQueue first, so changing back is probably okay.

Also changed the disposal to allow in-flight buffers to reach hardware;
otherwise you lose the last little bit of audio that's already been queued
but not played, which you can hear clearly in the loopwave test program.

Fixes #6377.
This commit is contained in:
Ryan C. Gordon 2022-10-19 09:14:16 -04:00
parent aefc6b5bb5
commit e7ab581d79
No known key found for this signature in database
GPG Key ID: FA148B892AB48044
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -704,6 +704,11 @@ COREAUDIO_CloseDevice(_THIS)
/* if callback fires again, feed silence; don't call into the app. */ /* if callback fires again, feed silence; don't call into the app. */
SDL_AtomicSet(&this->paused, 1); SDL_AtomicSet(&this->paused, 1);
/* dispose of the audio queue before waiting on the thread, or it might stall for a long time! */
if (this->hidden->audioQueue) {
AudioQueueDispose(this->hidden->audioQueue, 0);
}
if (this->hidden->thread) { if (this->hidden->thread) {
SDL_assert(SDL_AtomicGet(&this->shutdown) != 0); /* should have been set by SDL_audio.c */ SDL_assert(SDL_AtomicGet(&this->shutdown) != 0); /* should have been set by SDL_audio.c */
SDL_WaitThread(this->hidden->thread, NULL); SDL_WaitThread(this->hidden->thread, NULL);
@ -733,10 +738,6 @@ COREAUDIO_CloseDevice(_THIS)
open_devices = NULL; open_devices = NULL;
} }
if (this->hidden->audioQueue) {
AudioQueueDispose(this->hidden->audioQueue, 1);
}
if (this->hidden->ready_semaphore) { if (this->hidden->ready_semaphore) {
SDL_DestroySemaphore(this->hidden->ready_semaphore); SDL_DestroySemaphore(this->hidden->ready_semaphore);
} }