Mirrors_Framework/SDL
1
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2026-05-27 02:46:08 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

openslES: OpenSL ES on Android only supports two formats, limit to that.

Browse Source 
(Three with the floating point extension, which we use.)

This is according to:

https://developer.android.com/ndk/guides/audio/opensl/opensl-for-android

Previously, this would accept a request for Sint8 or Sint32 and disaster
would ensue.

Fixes #13779.

(cherry picked from commit 0b2a003a35)
(cherry picked from commit 7323104f97)
This commit is contained in:
Ryan C. Gordon
2025-09-01 11:37:10 -04:00
parent 1725d6b049
commit b8c802632b
1 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/audio/openslES/SDL_openslES.c
+13 -8
View File
@@ -413,27 +413,32 @@ static int openslES_CreatePCMPlayer(_THIS)
SLresult result; SLresult result;
int i; int i;
/* If we want to add floating point audio support (requires API level 21) /* according to https://developer.android.com/ndk/guides/audio/opensl/opensl-for-android,
it can be done as described here: Android's OpenSL ES only supports Uint8 and _littleendian_ Sint16.
https://developer.android.com/ndk/guides/audio/opensl/android-extensions.html#floating-point (and float32, with an extension we use, below.) */
*/
if (SDL_GetAndroidSDKVersion() >= 21) { if (SDL_GetAndroidSDKVersion() >= 21) {
SDL_AudioFormat test_format; SDL_AudioFormat test_format;
for (test_format = SDL_FirstAudioFormat(this->spec.format); test_format; test_format = SDL_NextAudioFormat()) { for (test_format = SDL_FirstAudioFormat(this->spec.format); test_format; test_format = SDL_NextAudioFormat()) {
if (SDL_AUDIO_ISSIGNED(test_format)) { switch (test_format) {
case SDL_AUDIO_U8:
case SDL_AUDIO_S16LE:
case SDL_AUDIO_F32:
break; break;
default:
continue;
} }
break;
} }
if (!test_format) { if (!test_format) {
/* Didn't find a compatible format : */ /* Didn't find a compatible format : */
LOGI("No compatible audio format, using signed 16-bit audio"); LOGI("No compatible audio format, using signed 16-bit LE audio");
test_format = AUDIO_S16SYS; test_format = AUDIO_S16LSB;
} }
this->spec.format = test_format; this->spec.format = test_format;
} else { } else {
/* Just go with signed 16-bit audio as it's the most compatible */ /* Just go with signed 16-bit audio as it's the most compatible */
this->spec.format = AUDIO_S16SYS; this->spec.format = AUDIO_S16LSB;
} }
/* Update the fragment size as size in bytes */ /* Update the fragment size as size in bytes */