mirrors/SDL
1
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2025-10-15 06:16:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed setting up surround sound on NVIDIA Shield TV

Browse Source
This commit is contained in:
Sam Lantinga
2024-11-07 19:05:03 -08:00
parent dbe82e685d
commit 37b49c98dc
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/audio/aaudio/SDL_aaudio.c
View File

@@ -298,7 +298,6 @@ static bool BuildAAudioStream(SDL_AudioDevice *device)
#endif #endif
aaudio_format_t format; aaudio_format_t format;
#ifdef SET_AUDIO_FORMAT
if ((device->spec.format == SDL_AUDIO_S32) && (SDL_GetAndroidSDKVersion() >= 31)) { if ((device->spec.format == SDL_AUDIO_S32) && (SDL_GetAndroidSDKVersion() >= 31)) {
format = AAUDIO_FORMAT_PCM_I32; format = AAUDIO_FORMAT_PCM_I32;
} else if (device->spec.format == SDL_AUDIO_F32) { } else if (device->spec.format == SDL_AUDIO_F32) {
@@ -308,7 +307,6 @@ static bool BuildAAudioStream(SDL_AudioDevice *device)
} }
ctx.AAudioStreamBuilder_setFormat(builder, format); ctx.AAudioStreamBuilder_setFormat(builder, format);
ctx.AAudioStreamBuilder_setSampleRate(builder, device->spec.freq); ctx.AAudioStreamBuilder_setSampleRate(builder, device->spec.freq);
#endif
ctx.AAudioStreamBuilder_setChannelCount(builder, device->spec.channels); ctx.AAudioStreamBuilder_setChannelCount(builder, device->spec.channels);
const aaudio_direction_t direction = (recording ? AAUDIO_DIRECTION_INPUT : AAUDIO_DIRECTION_OUTPUT); const aaudio_direction_t direction = (recording ? AAUDIO_DIRECTION_INPUT : AAUDIO_DIRECTION_OUTPUT);
@@ -323,9 +321,9 @@ static bool BuildAAudioStream(SDL_AudioDevice *device)
SDL_Log("Low latency audio disabled\n"); SDL_Log("Low latency audio disabled\n");
} }
LOGI("AAudio Try to open %u hz %u bit %u channels %s samples %u", LOGI("AAudio Try to open %u hz %s %u channels samples %u",
device->spec.freq, SDL_AUDIO_BITSIZE(device->spec.format), device->spec.freq, SDL_GetAudioFormatName(device->spec.format),
device->spec.channels, SDL_AUDIO_ISBIGENDIAN(device->spec.format) ? "BE" : "LE", device->sample_frames); device->spec.channels, device->sample_frames);
res = ctx.AAudioStreamBuilder_openStream(builder, &hidden->stream); res = ctx.AAudioStreamBuilder_openStream(builder, &hidden->stream);
if (res != AAUDIO_OK) { if (res != AAUDIO_OK) {
@@ -373,9 +371,9 @@ static bool BuildAAudioStream(SDL_AudioDevice *device)
return false; return false;
} }
LOGI("AAudio Actually opened %u hz %u bit %u channels %s samples %u, buffers %d", LOGI("AAudio Actually opened %u hz %s %u channels samples %u, buffers %d",
device->spec.freq, SDL_AUDIO_BITSIZE(device->spec.format), device->spec.freq, SDL_GetAudioFormatName(device->spec.format),
device->spec.channels, SDL_AUDIO_ISBIGENDIAN(device->spec.format) ? "BE" : "LE", device->sample_frames, hidden->num_buffers); device->spec.channels, device->sample_frames, hidden->num_buffers);
res = ctx.AAudioStream_requestStart(hidden->stream); res = ctx.AAudioStream_requestStart(hidden->stream);
if (res != AAUDIO_OK) { if (res != AAUDIO_OK) {