From: Glenn Kasten Date: Fri, 12 Aug 2011 21:29:12 +0000 (-0700) Subject: Fix indentation and redundant whitespace X-Git-Tag: android-x86-7.1-r1~599^2 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=509835294ed886b8dc3e3583dcb7125cc9ded938;p=android-x86%2Fsystem-media.git Fix indentation and redundant whitespace Change-Id: I8e0193ad5aa9405f64203bf7814d8a9e434c5dde --- diff --git a/wilhelm/src/android/AudioPlayer_to_android.cpp b/wilhelm/src/android/AudioPlayer_to_android.cpp index 8f85e599..0e8a8be5 100644 --- a/wilhelm/src/android/AudioPlayer_to_android.cpp +++ b/wilhelm/src/android/AudioPlayer_to_android.cpp @@ -129,7 +129,7 @@ static size_t adecoder_writeToBufferQueue(const uint8_t *data, size_t size, CAud // the buffer at the head of the buffer queue is full, update the state ap->mBufferQueue.mSizeConsumed = 0; - if (newFront == &ap->mBufferQueue.mArray[ap->mBufferQueue.mNumBuffers + 1]) { + if (newFront == &ap->mBufferQueue.mArray[ap->mBufferQueue.mNumBuffers + 1]) { newFront = ap->mBufferQueue.mArray; } ap->mBufferQueue.mFront = newFront; @@ -906,7 +906,7 @@ SLresult android_audioPlayer_checkSourceSink(CAudioPlayer *pAudioPlayer) case SL_DATALOCATOR_BUFFERQUEUE: case SL_DATALOCATOR_ANDROIDSIMPLEBUFFERQUEUE: { - SLDataLocator_BufferQueue *dl_bq = (SLDataLocator_BufferQueue *) pAudioSrc->pLocator; + SLDataLocator_BufferQueue *dl_bq = (SLDataLocator_BufferQueue *) pAudioSrc->pLocator; // Buffer format switch (sourceFormatType) { @@ -996,7 +996,7 @@ SLresult android_audioPlayer_checkSourceSink(CAudioPlayer *pAudioPlayer) // URI case SL_DATALOCATOR_URI: { - SLDataLocator_URI *dl_uri = (SLDataLocator_URI *) pAudioSrc->pLocator; + SLDataLocator_URI *dl_uri = (SLDataLocator_URI *) pAudioSrc->pLocator; if (NULL == dl_uri->URI) { return SL_RESULT_PARAMETER_INVALID; } @@ -1375,7 +1375,7 @@ SLresult android_audioPlayer_realize(CAudioPlayer *pAudioPlayer, SLboolean async { // initialize platform-specific CAudioPlayer fields - SLDataLocator_BufferQueue *dl_bq = (SLDataLocator_BufferQueue *) + SLDataLocator_BufferQueue *dl_bq = (SLDataLocator_BufferQueue *) pAudioPlayer->mDynamicSource.mDataSource; SLDataFormat_PCM *df_pcm = (SLDataFormat_PCM *) pAudioPlayer->mDynamicSource.mDataSource->pFormat; @@ -1573,39 +1573,39 @@ SLresult android_audioPlayer_preDestroy(CAudioPlayer *pAudioPlayer) { SL_LOGD("android_audioPlayer_preDestroy(%p)", pAudioPlayer); SLresult result = SL_RESULT_SUCCESS; - bool disableCallbacksBeforePreDestroy; - switch (pAudioPlayer->mAndroidObjType) { - // Not yet clear why this order is important, but it reduces detected deadlocks - case AUDIOPLAYER_FROM_URIFD_TO_PCM_BUFFERQUEUE: - disableCallbacksBeforePreDestroy = true; - break; - // Use the old behavior for all other use cases until proven - // case AUDIOPLAYER_FROM_ADTS_ABQ_TO_PCM_BUFFERQUEUE: - default: - disableCallbacksBeforePreDestroy = false; - break; - } + bool disableCallbacksBeforePreDestroy; + switch (pAudioPlayer->mAndroidObjType) { + // Not yet clear why this order is important, but it reduces detected deadlocks + case AUDIOPLAYER_FROM_URIFD_TO_PCM_BUFFERQUEUE: + disableCallbacksBeforePreDestroy = true; + break; + // Use the old behavior for all other use cases until proven + // case AUDIOPLAYER_FROM_ADTS_ABQ_TO_PCM_BUFFERQUEUE: + default: + disableCallbacksBeforePreDestroy = false; + break; + } - if (disableCallbacksBeforePreDestroy) { - object_unlock_exclusive(&pAudioPlayer->mObject); - if (pAudioPlayer->mCallbackProtector != 0) { - pAudioPlayer->mCallbackProtector->requestCbExitAndWait(); + if (disableCallbacksBeforePreDestroy) { + object_unlock_exclusive(&pAudioPlayer->mObject); + if (pAudioPlayer->mCallbackProtector != 0) { + pAudioPlayer->mCallbackProtector->requestCbExitAndWait(); + } + object_lock_exclusive(&pAudioPlayer->mObject); } - object_lock_exclusive(&pAudioPlayer->mObject); - } if (pAudioPlayer->mAPlayer != 0) { pAudioPlayer->mAPlayer->preDestroy(); } SL_LOGD("android_audioPlayer_preDestroy(%p) after mAPlayer->preDestroy()", pAudioPlayer); - if (!disableCallbacksBeforePreDestroy) { - object_unlock_exclusive(&pAudioPlayer->mObject); - if (pAudioPlayer->mCallbackProtector != 0) { - pAudioPlayer->mCallbackProtector->requestCbExitAndWait(); + if (!disableCallbacksBeforePreDestroy) { + object_unlock_exclusive(&pAudioPlayer->mObject); + if (pAudioPlayer->mCallbackProtector != 0) { + pAudioPlayer->mCallbackProtector->requestCbExitAndWait(); + } + object_lock_exclusive(&pAudioPlayer->mObject); } - object_lock_exclusive(&pAudioPlayer->mObject); - } return result; } diff --git a/wilhelm/src/android/AudioRecorder_to_android.cpp b/wilhelm/src/android/AudioRecorder_to_android.cpp index 497bed24..d7bafcb7 100644 --- a/wilhelm/src/android/AudioRecorder_to_android.cpp +++ b/wilhelm/src/android/AudioRecorder_to_android.cpp @@ -192,7 +192,7 @@ SLresult android_audioRecorder_checkSourceSinkSupport(CAudioRecorder* ar) { } else { // check it's an input device - SLDataLocator_IODevice *dl_iod = (SLDataLocator_IODevice *) pAudioSrc->pLocator; + SLDataLocator_IODevice *dl_iod = (SLDataLocator_IODevice *) pAudioSrc->pLocator; if (SL_IODEVICE_AUDIOINPUT != dl_iod->deviceType) { SL_LOGE(ERROR_RECORDER_IODEVICE_MUST_BE_AUDIOINPUT); return SL_RESULT_PARAMETER_INVALID; @@ -244,7 +244,7 @@ static void audioRecorder_callback(int event, void* user, void *info) { // finish pushing the buffer or push the buffer in one shot pBuff->size = oldFront->mSize - ar->mBufferQueue.mSizeConsumed; ar->mBufferQueue.mSizeConsumed = 0; - if (newFront == &ar->mBufferQueue.mArray[ar->mBufferQueue.mNumBuffers + 1]) { + if (newFront == &ar->mBufferQueue.mArray[ar->mBufferQueue.mNumBuffers + 1]) { newFront = ar->mBufferQueue.mArray; } ar->mBufferQueue.mFront = newFront; diff --git a/wilhelm/src/android/VideoCodec_to_android.cpp b/wilhelm/src/android/VideoCodec_to_android.cpp index 20aad288..5f3deaab 100644 --- a/wilhelm/src/android/VideoCodec_to_android.cpp +++ b/wilhelm/src/android/VideoCodec_to_android.cpp @@ -181,7 +181,7 @@ SLresult android_videoCodec_getProfileLevelCombination(XAuint32 decoderId, XAuin pDescr->codecId = decoderId; pDescr->profileSetting = convertOpenMaxIlToAl(VideoDecoderCapabilities[decoderIndex]. itemAt(0).mProfileLevels.itemAt(plIndex).mProfile); - pDescr->levelSetting = convertOpenMaxIlToAl(VideoDecoderCapabilities[decoderIndex]. + pDescr->levelSetting = convertOpenMaxIlToAl(VideoDecoderCapabilities[decoderIndex]. itemAt(0).mProfileLevels.itemAt(plIndex).mLevel); // initialize the fields we don't know about pDescr->maxWidth = 0; diff --git a/wilhelm/src/itf/IEqualizer.c b/wilhelm/src/itf/IEqualizer.c index e50bdb7e..14ff9654 100644 --- a/wilhelm/src/itf/IEqualizer.c +++ b/wilhelm/src/itf/IEqualizer.c @@ -80,25 +80,25 @@ static SLresult IEqualizer_IsEnabled(SLEqualizerItf self, SLboolean *pEnabled) { SL_ENTER_INTERFACE - if (NULL == pEnabled) { - result = SL_RESULT_PARAMETER_INVALID; - } else { - IEqualizer *thiz = (IEqualizer *) self; - interface_lock_exclusive(thiz); - SLboolean enabled = thiz->mEnabled; + if (NULL == pEnabled) { + result = SL_RESULT_PARAMETER_INVALID; + } else { + IEqualizer *thiz = (IEqualizer *) self; + interface_lock_exclusive(thiz); + SLboolean enabled = thiz->mEnabled; #if !defined(ANDROID) - *pEnabled = enabled; - result = SL_RESULT_SUCCESS; + *pEnabled = enabled; + result = SL_RESULT_SUCCESS; #else - if (NO_EQ(thiz)) { - result = SL_RESULT_CONTROL_LOST; - } else { - *pEnabled = (SLboolean) thiz->mEqEffect->getEnabled(); - result = SL_RESULT_SUCCESS; - } + if (NO_EQ(thiz)) { + result = SL_RESULT_CONTROL_LOST; + } else { + *pEnabled = (SLboolean) thiz->mEqEffect->getEnabled(); + result = SL_RESULT_SUCCESS; + } #endif - interface_unlock_exclusive(thiz); - } + interface_unlock_exclusive(thiz); + } SL_LEAVE_INTERFACE } diff --git a/wilhelm/src/itf/IStreamInformation.c b/wilhelm/src/itf/IStreamInformation.c index bfd92331..d8da5a9b 100644 --- a/wilhelm/src/itf/IStreamInformation.c +++ b/wilhelm/src/itf/IStreamInformation.c @@ -60,7 +60,7 @@ static XAresult IStreamInformation_QueryStreamType( XAStreamInformationItf self, } #ifndef ANDROID - *domain = XA_DOMAINTYPE_UNKNOWN; + *domain = XA_DOMAINTYPE_UNKNOWN; #else if (0 == streamIndex) { // stream 0 is reserved for the container diff --git a/wilhelm/src/itf/IVirtualizer.c b/wilhelm/src/itf/IVirtualizer.c index 70e22953..c640811a 100644 --- a/wilhelm/src/itf/IVirtualizer.c +++ b/wilhelm/src/itf/IVirtualizer.c @@ -64,27 +64,27 @@ static SLresult IVirtualizer_IsEnabled(SLVirtualizerItf self, SLboolean *pEnable { SL_ENTER_INTERFACE - if (NULL == pEnabled) { - result = SL_RESULT_PARAMETER_INVALID; - } else { - IVirtualizer *thiz = (IVirtualizer *) self; - interface_lock_exclusive(thiz); - SLboolean enabled = thiz->mEnabled; + if (NULL == pEnabled) { + result = SL_RESULT_PARAMETER_INVALID; + } else { + IVirtualizer *thiz = (IVirtualizer *) self; + interface_lock_exclusive(thiz); + SLboolean enabled = thiz->mEnabled; #if !defined(ANDROID) - *pEnabled = enabled; - result = SL_RESULT_SUCCESS; + *pEnabled = enabled; + result = SL_RESULT_SUCCESS; #else - if (NO_VIRTUALIZER(thiz)) { - result = SL_RESULT_CONTROL_LOST; - } else { - *pEnabled = (SLboolean) thiz->mVirtualizerEffect->getEnabled(); - result = SL_RESULT_SUCCESS; - } + if (NO_VIRTUALIZER(thiz)) { + result = SL_RESULT_CONTROL_LOST; + } else { + *pEnabled = (SLboolean) thiz->mVirtualizerEffect->getEnabled(); + result = SL_RESULT_SUCCESS; + } #endif - interface_unlock_exclusive(thiz); - } + interface_unlock_exclusive(thiz); + } - SL_LEAVE_INTERFACE + SL_LEAVE_INTERFACE } @@ -92,27 +92,27 @@ static SLresult IVirtualizer_SetStrength(SLVirtualizerItf self, SLpermille stren { SL_ENTER_INTERFACE - if ((VIRTUALIZER_STRENGTH_MIN > strength) || (VIRTUALIZER_STRENGTH_MAX < strength)) { - result = SL_RESULT_PARAMETER_INVALID; - } else { - IVirtualizer *thiz = (IVirtualizer *) self; - interface_lock_exclusive(thiz); + if ((VIRTUALIZER_STRENGTH_MIN > strength) || (VIRTUALIZER_STRENGTH_MAX < strength)) { + result = SL_RESULT_PARAMETER_INVALID; + } else { + IVirtualizer *thiz = (IVirtualizer *) self; + interface_lock_exclusive(thiz); #if !defined(ANDROID) - thiz->mStrength = strength; - result = SL_RESULT_SUCCESS; + thiz->mStrength = strength; + result = SL_RESULT_SUCCESS; #else - if (NO_VIRTUALIZER(thiz)) { - result = SL_RESULT_CONTROL_LOST; - } else { - android::status_t status = android_virt_setParam(thiz->mVirtualizerEffect, - VIRTUALIZER_PARAM_STRENGTH, &strength); - result = android_fx_statusToResult(status); - } + if (NO_VIRTUALIZER(thiz)) { + result = SL_RESULT_CONTROL_LOST; + } else { + android::status_t status = android_virt_setParam(thiz->mVirtualizerEffect, + VIRTUALIZER_PARAM_STRENGTH, &strength); + result = android_fx_statusToResult(status); + } #endif - interface_unlock_exclusive(thiz); - } + interface_unlock_exclusive(thiz); + } - SL_LEAVE_INTERFACE + SL_LEAVE_INTERFACE } diff --git a/wilhelm/tests/native-media/jni/native-media-jni.c b/wilhelm/tests/native-media/jni/native-media-jni.c index 6c5a2832..e8db6f26 100644 --- a/wilhelm/tests/native-media/jni/native-media-jni.c +++ b/wilhelm/tests/native-media/jni/native-media-jni.c @@ -445,7 +445,7 @@ jboolean Java_com_example_nativemedia_NativeMedia_createStreamingMediaPlayer(JNI // start the playback res = (*playerPlayItf)->SetPlayState(playerPlayItf, XA_PLAYSTATE_PLAYING); - assert(XA_RESULT_SUCCESS == res); + assert(XA_RESULT_SUCCESS == res); return JNI_TRUE; } diff --git a/wilhelm/tools/hashgen/Makefile b/wilhelm/tools/hashgen/Makefile index b9db8635..525e2f9b 100644 --- a/wilhelm/tools/hashgen/Makefile +++ b/wilhelm/tools/hashgen/Makefile @@ -58,7 +58,7 @@ part5gen : part5gen.o OpenSLES_IID.o interfaces.o clean : $(RM) part5gen frag1 *.o - $(RM) part23in.gperf part5gen.c part23in.c + $(RM) part23in.gperf part5gen.c part23in.c $(RM) part2.c part3.c part5.c part7.c distclean : clean