ryujinx/SDL
1
0
Fork 0
mirror of https://github.com/Ryujinx/SDL.git synced 2024-12-23 02:05:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

audio: Wait for device thread to set device->threadid before continuing.

Browse source 
This fixes a (likely harmless) race condition in `is_in_audio_device_thread`.

Reference Issue #7427.
This commit is contained in:
Ryan C. Gordon 2023-11-19 12:25:13 -05:00
parent c67ff82377
commit e51760e111
No known key found for this signature in database
GPG key ID: FA148B892AB48044
1 changed files with 33 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
src/audio/SDL_audio.c
View file

@ -31,6 +31,12 @@
#define _THIS SDL_AudioDevice *_this
typedef struct AudioThreadStartupData
{
SDL_AudioDevice *device;
SDL_sem *startup_semaphore;
} AudioThreadStartupData;
static SDL_AudioDriver current_audio;
static SDL_AudioDevice *open_devices[16];
@ -663,9 +669,10 @@ extern void Android_JNI_AudioSetThreadPriority(int, int);
#endif
/* The general mixing thread function */
static int SDLCALL SDL_RunAudio(void *devicep)
static int SDLCALL SDL_RunAudio(void *userdata)
{
SDL_AudioDevice *device = (SDL_AudioDevice *)devicep;
const AudioThreadStartupData *startup_data = (const AudioThreadStartupData *) userdata;
SDL_AudioDevice *device = startup_data->device;
void *udata = device->callbackspec.userdata;
SDL_AudioCallback callback = device->callbackspec.callback;
int data_len = 0;
@ -685,6 +692,9 @@ static int SDLCALL SDL_RunAudio(void *devicep)
/* Perform any thread setup */
device->threadid = SDL_ThreadID();
SDL_SemPost(startup_data->startup_semaphore); /* SDL_OpenAudioDevice may now continue. */
current_audio.impl.ThreadInit(device);
/* Loop, filling the audio buffers */
@ -761,9 +771,10 @@ static int SDLCALL SDL_RunAudio(void *devicep)
/* !!! FIXME: this needs to deal with device spec changes. */
/* The general capture thread function */
static int SDLCALL SDL_CaptureAudio(void *devicep)
static int SDLCALL SDL_CaptureAudio(void *userdata)
{
SDL_AudioDevice *device = (SDL_AudioDevice *)devicep;
const AudioThreadStartupData *startup_data = (const AudioThreadStartupData *) userdata;
SDL_AudioDevice *device = startup_data->device;
const int silence = (int)device->spec.silence;
const Uint32 delay = ((device->spec.samples * 1000) / device->spec.freq);
const int data_len = device->spec.size;
@ -785,6 +796,9 @@ static int SDLCALL SDL_CaptureAudio(void *devicep)
/* Perform any thread setup */
device->threadid = SDL_ThreadID();
SDL_SemPost(startup_data->startup_semaphore); /* SDL_OpenAudioDevice may now continue. */
current_audio.impl.ThreadInit(device);
/* Loop, filling the audio buffers */
@ -1500,16 +1514,30 @@ static SDL_AudioDeviceID open_audio_device(const char *devname, int iscapture,
if (!current_audio.impl.ProvidesOwnCallbackThread) {
/* Start the audio thread */
char threadname[64];
AudioThreadStartupData startup_data;
startup_data.device = device;
startup_data.startup_semaphore = SDL_CreateSemaphore(0);
if (!startup_data.startup_semaphore) {
close_audio_device(device);
SDL_SetError("Couldn't create audio thread startup semaphore");
SDL_UnlockMutex(current_audio.detectionLock);
return 0;
}
(void)SDL_snprintf(threadname, sizeof(threadname), "SDLAudio%c%" SDL_PRIu32, (iscapture) ? 'C' : 'P', device->id);
device->thread = SDL_CreateThreadInternal(iscapture ? SDL_CaptureAudio : SDL_RunAudio, threadname, 0, device);
device->thread = SDL_CreateThreadInternal(iscapture ? SDL_CaptureAudio : SDL_RunAudio, threadname, 0, &startup_data);
if (device->thread == NULL) {
SDL_DestroySemaphore(startup_data.startup_semaphore);
close_audio_device(device);
SDL_SetError("Couldn't create audio thread");
SDL_UnlockMutex(current_audio.detectionLock);
return 0;
}
SDL_SemWait(startup_data.startup_semaphore);
SDL_DestroySemaphore(startup_data.startup_semaphore);
}
SDL_UnlockMutex(current_audio.detectionLock);