From 8c51cae7849dbd86bb62f3ebd444a527e56e0c4d Mon Sep 17 00:00:00 2001
From: Ozkan Sezer <[EMAIL REDACTED]>
Date: Sat, 23 Jul 2022 14:56:04 +0300
Subject: [PATCH] audio/aaudio, audio/openslES: fix
-Wdeclaration-after-statement errors
Fixes https://github.com/libsdl-org/SDL/issues/5950
---
src/audio/aaudio/SDL_aaudio.c | 9 +++--
src/audio/openslES/SDL_openslES.c | 62 ++++++++++++++++---------------
2 files changed, 38 insertions(+), 33 deletions(-)
diff --git a/src/audio/aaudio/SDL_aaudio.c b/src/audio/aaudio/SDL_aaudio.c
index 1d1553ba724..5f318661d0e 100644
--- a/src/audio/aaudio/SDL_aaudio.c
+++ b/src/audio/aaudio/SDL_aaudio.c
@@ -437,14 +437,17 @@ void aaudio_ResumeDevices(void)
*/
SDL_bool aaudio_DetectBrokenPlayState( void )
{
+ struct SDL_PrivateAudioData *private;
+ int64_t framePosition, timeNanoseconds;
+ aaudio_result_t res;
+
if ( !audioDevice || !audioDevice->hidden ) {
return SDL_FALSE;
}
- struct SDL_PrivateAudioData *private = audioDevice->hidden;
+ private = audioDevice->hidden;
- int64_t framePosition, timeNanoseconds;
- aaudio_result_t res = ctx.AAudioStream_getTimestamp( private->stream, CLOCK_MONOTONIC, &framePosition, &timeNanoseconds );
+ res = ctx.AAudioStream_getTimestamp( private->stream, CLOCK_MONOTONIC, &framePosition, &timeNanoseconds );
if ( res == AAUDIO_ERROR_INVALID_STATE ) {
aaudio_stream_state_t currentState = ctx.AAudioStream_getState( private->stream );
/* AAudioStream_getTimestamp() will also return AAUDIO_ERROR_INVALID_STATE while the stream is still initially starting. But we only care if it silently went invalid while playing. */
diff --git a/src/audio/openslES/SDL_openslES.c b/src/audio/openslES/SDL_openslES.c
index 39d64b2b6aa..474de3bfe1e 100644
--- a/src/audio/openslES/SDL_openslES.c
+++ b/src/audio/openslES/SDL_openslES.c
@@ -131,6 +131,8 @@ static void openslES_DestroyEngine(void)
static int
openslES_CreateEngine(void)
{
+ const SLInterfaceID ids[1] = { SL_IID_VOLUME };
+ const SLboolean req[1] = { SL_BOOLEAN_FALSE };
SLresult result;
LOGI("openSLES_CreateEngine()");
@@ -160,8 +162,6 @@ openslES_CreateEngine(void)
LOGI("EngineGetInterface OK");
/* create output mix */
- const SLInterfaceID ids[1] = { SL_IID_VOLUME };
- const SLboolean req[1] = { SL_BOOLEAN_FALSE };
result = (*engineEngine)->CreateOutputMix(engineEngine, &outputMixObject, 1, ids, req);
if (SL_RESULT_SUCCESS != result) {
LOGE("CreateOutputMix failed: %d", result);
@@ -229,6 +229,12 @@ openslES_CreatePCMRecorder(_THIS)
{
struct SDL_PrivateAudioData *audiodata = this->hidden;
SLDataFormat_PCM format_pcm;
+ SLDataLocator_AndroidSimpleBufferQueue loc_bufq;
+ SLDataSink audioSnk;
+ SLDataLocator_IODevice loc_dev;
+ SLDataSource audioSrc;
+ const SLInterfaceID ids[1] = { SL_IID_ANDROIDSIMPLEBUFFERQUEUE };
+ const SLboolean req[1] = { SL_BOOLEAN_TRUE };
SLresult result;
int i;
@@ -250,11 +256,16 @@ openslES_CreatePCMRecorder(_THIS)
this->spec.channels, (this->spec.format & 0x1000) ? "BE" : "LE", this->spec.samples);
/* configure audio source */
- SLDataLocator_IODevice loc_dev = {SL_DATALOCATOR_IODEVICE, SL_IODEVICE_AUDIOINPUT, SL_DEFAULTDEVICEID_AUDIOINPUT, NULL};
- SLDataSource audioSrc = {&loc_dev, NULL};
+ loc_dev.locatorType = SL_DATALOCATOR_IODEVICE;
+ loc_dev.deviceType = SL_IODEVICE_AUDIOINPUT;
+ loc_dev.deviceID = SL_DEFAULTDEVICEID_AUDIOINPUT;
+ loc_dev.device = NULL;
+ audioSrc.pLocator = &loc_dev;
+ audioSrc.pFormat = NULL;
/* configure audio sink */
- SLDataLocator_AndroidSimpleBufferQueue loc_bufq = { SL_DATALOCATOR_ANDROIDSIMPLEBUFFERQUEUE, NUM_BUFFERS };
+ loc_bufq.locatorType = SL_DATALOCATOR_ANDROIDSIMPLEBUFFERQUEUE;
+ loc_bufq.numBuffers = NUM_BUFFERS;
format_pcm.formatType = SL_DATAFORMAT_PCM;
format_pcm.numChannels = this->spec.channels;
@@ -264,17 +275,11 @@ openslES_CreatePCMRecorder(_THIS)
format_pcm.endianness = SL_BYTEORDER_LITTLEENDIAN;
format_pcm.channelMask = SL_SPEAKER_FRONT_CENTER;
- SLDataSink audioSnk = { &loc_bufq, &format_pcm };
+ audioSnk.pLocator = &loc_bufq;
+ audioSnk.pFormat = &format_pcm;
/* create audio recorder */
/* (requires the RECORD_AUDIO permission) */
- const SLInterfaceID ids[1] = {
- SL_IID_ANDROIDSIMPLEBUFFERQUEUE,
- };
- const SLboolean req[1] = {
- SL_BOOLEAN_TRUE,
- };
-
result = (*engineEngine)->CreateAudioRecorder(engineEngine, &recorderObject, &audioSrc, &audioSnk, 1, ids, req);
if (SL_RESULT_SUCCESS != result) {
LOGE("CreateAudioRecorder failed: %d", result);
@@ -354,7 +359,6 @@ openslES_CreatePCMRecorder(_THIS)
return 0;
failed:
-
return SDL_SetError("Open device failed!");
}
@@ -384,7 +388,6 @@ openslES_DestroyPCMPlayer(_THIS)
/* destroy buffer queue audio player object, and invalidate all associated interfaces */
if (bqPlayerObject != NULL) {
-
(*bqPlayerObject)->Destroy(bqPlayerObject);
bqPlayerObject = NULL;
@@ -406,8 +409,14 @@ static int
openslES_CreatePCMPlayer(_THIS)
{
struct SDL_PrivateAudioData *audiodata = this->hidden;
+ SLDataLocator_AndroidSimpleBufferQueue loc_bufq;
SLDataFormat_PCM format_pcm;
SLAndroidDataFormat_PCM_EX format_pcm_ex;
+ SLDataSource audioSrc;
+ SLDataSink audioSnk;
+ SLDataLocator_OutputMix loc_outmix;
+ const SLInterfaceID ids[2] = { SL_IID_ANDROIDSIMPLEBUFFERQUEUE, SL_IID_VOLUME };
+ const SLboolean req[2] = { SL_BOOLEAN_TRUE, SL_BOOLEAN_FALSE };
SLresult result;
int i;
@@ -442,7 +451,8 @@ openslES_CreatePCMPlayer(_THIS)
this->spec.channels, (this->spec.format & 0x1000) ? "BE" : "LE", this->spec.samples);
/* configure audio source */
- SLDataLocator_AndroidSimpleBufferQueue loc_bufq = { SL_DATALOCATOR_ANDROIDSIMPLEBUFFERQUEUE, NUM_BUFFERS };
+ loc_bufq.locatorType = SL_DATALOCATOR_ANDROIDSIMPLEBUFFERQUEUE;
+ loc_bufq.numBuffers = NUM_BUFFERS;
format_pcm.formatType = SL_DATAFORMAT_PCM;
format_pcm.numChannels = this->spec.channels;
@@ -501,23 +511,16 @@ openslES_CreatePCMPlayer(_THIS)
format_pcm_ex.representation = SL_ANDROID_PCM_REPRESENTATION_FLOAT;
}
- SLDataSource audioSrc = { &loc_bufq, SDL_AUDIO_ISFLOAT(this->spec.format) ? (void*)&format_pcm_ex : (void*)&format_pcm };
+ audioSrc.pLocator = &loc_bufq;
+ audioSrc.pFormat = SDL_AUDIO_ISFLOAT(this->spec.format) ? (void*)&format_pcm_ex : (void*)&format_pcm;
/* configure audio sink */
- SLDataLocator_OutputMix loc_outmix = { SL_DATALOCATOR_OUTPUTMIX, outputMixObject };
- SLDataSink audioSnk = { &loc_outmix, NULL };
+ loc_outmix.locatorType = SL_DATALOCATOR_OUTPUTMIX;
+ loc_outmix.outputMix = outputMixObject;
+ audioSnk.pLocator = &loc_outmix;
+ audioSnk.pFormat = NULL;
/* create audio player */
- const SLInterfaceID ids[2] = {
- SL_IID_ANDROIDSIMPLEBUFFERQUEUE,
- SL_IID_VOLUME
- };
-
- const SLboolean req[2] = {
- SL_BOOLEAN_TRUE,
- SL_BOOLEAN_FALSE,
- };
-
result = (*engineEngine)->CreateAudioPlayer(engineEngine, &bqPlayerObject, &audioSrc, &audioSnk, 2, ids, req);
if (SL_RESULT_SUCCESS != result) {
LOGE("CreateAudioPlayer failed: %d", result);
@@ -590,7 +593,6 @@ openslES_CreatePCMPlayer(_THIS)
return 0;
failed:
-
return -1;
}