mirrors/SDL
1
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2025-09-08 12:28:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

audio: Fixed assertions when capture devices have wrong audio formats.

Browse Source 
Fixes #8376.
This commit is contained in:
Ryan C. Gordon
2023-10-11 10:37:28 -04:00
parent bb2f767f5d
commit 044046bc50
2 changed files with 31 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/audio/SDL_audio.c
View File

@@ -189,12 +189,13 @@ static SDL_bool AudioDeviceCanUseSimpleCopy(SDL_AudioDevice *device)
// should hold device->lock before calling. // should hold device->lock before calling.
static void UpdateAudioStreamFormatsPhysical(SDL_AudioDevice *device) static void UpdateAudioStreamFormatsPhysical(SDL_AudioDevice *device)
{ {
const SDL_bool iscapture = device->iscapture; if (!device->iscapture) { // for capture devices, we only want to move to float32 for postmix, which we'll handle elsewhere.
const SDL_bool simple_copy = AudioDeviceCanUseSimpleCopy(device); const SDL_bool simple_copy = AudioDeviceCanUseSimpleCopy(device);
SDL_AudioSpec spec; SDL_AudioSpec spec;
device->simple_copy = simple_copy; device->simple_copy = simple_copy;
SDL_copyp(&spec, &device->spec); SDL_copyp(&spec, &device->spec);
if (!simple_copy) { if (!simple_copy) {
spec.format = SDL_AUDIO_F32; // mixing and postbuf operates in float32 format. spec.format = SDL_AUDIO_F32; // mixing and postbuf operates in float32 format.
} }
@@ -204,11 +205,12 @@ static void UpdateAudioStreamFormatsPhysical(SDL_AudioDevice *device)
// set the proper end of the stream to the device's format. // set the proper end of the stream to the device's format.
// SDL_SetAudioStreamFormat does a ton of validation just to memcpy an audiospec. // SDL_SetAudioStreamFormat does a ton of validation just to memcpy an audiospec.
SDL_LockMutex(stream->lock); SDL_LockMutex(stream->lock);
SDL_copyp(iscapture ? &stream->src_spec : &stream->dst_spec, &spec); SDL_copyp(&stream->dst_spec, &spec);
SDL_UnlockMutex(stream->lock); SDL_UnlockMutex(stream->lock);
} }
} }
} }
}
@@ -1567,6 +1569,16 @@ int SDL_SetAudioPostmixCallback(SDL_AudioDeviceID devid, SDL_AudioPostmixCallbac
if (retval == 0) { if (retval == 0) {
logdev->postmix = callback; logdev->postmix = callback;
logdev->postmix_userdata = userdata; logdev->postmix_userdata = userdata;
if (device->iscapture) {
for (SDL_AudioStream *stream = logdev->bound_streams; stream != NULL; stream = stream->next_binding) {
// set the proper end of the stream to the device's format.
// SDL_SetAudioStreamFormat does a ton of validation just to memcpy an audiospec.
SDL_LockMutex(stream->lock);
stream->src_spec.format = callback ? SDL_AUDIO_F32 : device->spec.format;
SDL_UnlockMutex(stream->lock);
}
}
} }
UpdateAudioStreamFormatsPhysical(device); UpdateAudioStreamFormatsPhysical(device);
@@ -1639,6 +1651,8 @@ int SDL_BindAudioStreams(SDL_AudioDeviceID devid, SDL_AudioStream **streams, int
} }
logdev->bound_streams = stream; logdev->bound_streams = stream;
stream->src_spec.format = logdev->postmix ? SDL_AUDIO_F32 : device->spec.format;
SDL_UnlockMutex(stream->lock); SDL_UnlockMutex(stream->lock);
} }
} }

2
src/audio/SDL_sysaudio.h
View File

@@ -156,6 +156,8 @@ typedef struct SDL_AudioDriver
SDL_AudioStream *existing_streams; // a list of all existing SDL_AudioStreams. SDL_AudioStream *existing_streams; // a list of all existing SDL_AudioStreams.
SDL_AudioDeviceID default_output_device_id; SDL_AudioDeviceID default_output_device_id;
SDL_AudioDeviceID default_capture_device_id; SDL_AudioDeviceID default_capture_device_id;
// !!! FIXME: most (all?) of these don't have to be atomic.
SDL_AtomicInt output_device_count; SDL_AtomicInt output_device_count;
SDL_AtomicInt capture_device_count; SDL_AtomicInt capture_device_count;
SDL_AtomicInt last_device_instance_id; // increments on each device add to provide unique instance IDs SDL_AtomicInt last_device_instance_id; // increments on each device add to provide unique instance IDs