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

audio: Fixed bug when setting up mixing formats.

Browse Source 
Reference Issue #8226.
This commit is contained in:
Ryan C. Gordon
2023-09-27 11:48:46 -04:00
parent 9667aa18e6
commit a5175e5ed0
1 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/audio/SDL_audio.c
View File

@@ -173,14 +173,29 @@ void OnAudioStreamDestroy(SDL_AudioStream *stream)
} }
// device should be locked when calling this.
static SDL_bool AudioDeviceCanUseSimpleCopy(SDL_AudioDevice *device)
{
SDL_assert(device != NULL);
return (
device->logical_devices && // there's a logical device
!device->logical_devices->next && // there's only _ONE_ logical device
!device->logical_devices->postmix && // there isn't a postmix callback
!SDL_AtomicGet(&device->logical_devices->paused) && // it isn't paused
device->logical_devices->bound_streams && // there's a bound stream
!device->logical_devices->bound_streams->next_binding // there's only _ONE_ bound stream.
) ? SDL_TRUE : SDL_FALSE;
}
// should hold logdev's physical device's lock before calling. // should hold logdev's physical device's lock before calling.
static void UpdateAudioStreamFormatsLogical(SDL_LogicalAudioDevice *logdev) static void UpdateAudioStreamFormatsLogical(SDL_LogicalAudioDevice *logdev)
{ {
const SDL_bool iscapture = logdev->physical_device->iscapture; SDL_AudioDevice *device = logdev->physical_device;
const SDL_bool iscapture = device->iscapture;
SDL_AudioSpec spec; SDL_AudioSpec spec;
SDL_copyp(&spec, &logdev->physical_device->spec); SDL_copyp(&spec, &device->spec);
if (logdev->postmix != NULL) { if (!AudioDeviceCanUseSimpleCopy(device)) {
spec.format = SDL_AUDIO_F32; spec.format = SDL_AUDIO_F32; // mixing and postbuf operates in float32 format.
} }
for (SDL_AudioStream *stream = logdev->bound_streams; stream != NULL; stream = stream->next_binding) { for (SDL_AudioStream *stream = logdev->bound_streams; stream != NULL; stream = stream->next_binding) {
@@ -201,20 +216,6 @@ static void UpdateAudioStreamFormatsPhysical(SDL_AudioDevice *device)
} }
// device should be locked when calling this.
static SDL_bool AudioDeviceCanUseSimpleCopy(SDL_AudioDevice *device)
{
SDL_assert(device != NULL);
return (
device->logical_devices && // there's a logical device
!device->logical_devices->next && // there's only _ONE_ logical device
!device->logical_devices->postmix && // there isn't a postmix callback
!SDL_AtomicGet(&device->logical_devices->paused) && // it isn't paused
device->logical_devices->bound_streams && // there's a bound stream
!device->logical_devices->bound_streams->next_binding // there's only _ONE_ bound stream.
) ? SDL_TRUE : SDL_FALSE;
}
// device management and hotplug... // device management and hotplug...