Skip to content

Commit

Permalink
Fix indentation and redundant whitespace
Browse files Browse the repository at this point in the history 
Change-Id: I8e0193ad5aa9405f64203bf7814d8a9e434c5dde
  • Loading branch information
@gkasten
gkasten committed Dec 15, 2011
1 parent 1421fde commit 22ced1d
Show file tree
Hide file tree
Showing 8 changed files with 84 additions and 84 deletions.
56 changes: 28 additions & 28 deletions src/android/AudioPlayer_to_android.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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) {
Expand Down Expand Up @@ -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;
}
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
}
Expand Down
4 changes: 2 additions & 2 deletions src/android/AudioRecorder_to_android.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/android/VideoCodec_to_android.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
32 changes: 16 additions & 16 deletions src/itf/IEqualizer.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down
2 changes: 1 addition & 1 deletion src/itf/IStreamInformation.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
68 changes: 34 additions & 34 deletions src/itf/IVirtualizer.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,55 +64,55 @@ 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
}


static SLresult IVirtualizer_SetStrength(SLVirtualizerItf self, SLpermille strength)
{
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
}


Expand Down
2 changes: 1 addition & 1 deletion tests/native-media/jni/native-media-jni.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
2 changes: 1 addition & 1 deletion tools/hashgen/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 22ced1d

Please sign in to comment.