Merge "Prepare to move system/media"
diff --git a/src/Android.mk b/src/Android.mk
index e681e8c..c0ced44 100644
--- a/src/Android.mk
+++ b/src/Android.mk
@@ -177,6 +177,7 @@
LOCAL_SHARED_LIBRARIES := \
libutils \
libmedia \
+ libmedia_native \
libbinder \
libstagefright \
libstagefright_foundation \
diff --git a/src/android/AudioPlayer_to_android.cpp b/src/android/AudioPlayer_to_android.cpp
index 36a036d..ae526fe 100644
--- a/src/android/AudioPlayer_to_android.cpp
+++ b/src/android/AudioPlayer_to_android.cpp
@@ -129,7 +129,7 @@
// 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;
@@ -900,7 +900,7 @@
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) {
@@ -990,7 +990,7 @@
// 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;
}
@@ -1364,7 +1364,7 @@
{
// 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;
@@ -1562,39 +1562,39 @@
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;
- }
-
- if (disableCallbacksBeforePreDestroy) {
- object_unlock_exclusive(&pAudioPlayer->mObject);
- if (pAudioPlayer->mCallbackProtector != 0) {
- pAudioPlayer->mCallbackProtector->requestCbExitAndWait();
+ 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;
}
- object_lock_exclusive(&pAudioPlayer->mObject);
- }
+
+ if (disableCallbacksBeforePreDestroy) {
+ object_unlock_exclusive(&pAudioPlayer->mObject);
+ if (pAudioPlayer->mCallbackProtector != 0) {
+ pAudioPlayer->mCallbackProtector->requestCbExitAndWait();
+ }
+ 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/src/android/AudioRecorder_to_android.cpp b/src/android/AudioRecorder_to_android.cpp
index e288a6e..326b8c9 100644
--- a/src/android/AudioRecorder_to_android.cpp
+++ b/src/android/AudioRecorder_to_android.cpp
@@ -192,7 +192,7 @@
} 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 @@
// 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/src/android/VideoCodec_to_android.cpp b/src/android/VideoCodec_to_android.cpp
index 01c3af2..113bd8c 100644
--- a/src/android/VideoCodec_to_android.cpp
+++ b/src/android/VideoCodec_to_android.cpp
@@ -181,7 +181,7 @@
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/src/itf/IEqualizer.c b/src/itf/IEqualizer.c
index e50bdb7..14ff965 100644
--- a/src/itf/IEqualizer.c
+++ b/src/itf/IEqualizer.c
@@ -80,25 +80,25 @@
{
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/src/itf/IStreamInformation.c b/src/itf/IStreamInformation.c
index bfd9233..d8da5a9 100644
--- a/src/itf/IStreamInformation.c
+++ b/src/itf/IStreamInformation.c
@@ -60,7 +60,7 @@
}
#ifndef ANDROID
- *domain = XA_DOMAINTYPE_UNKNOWN;
+ *domain = XA_DOMAINTYPE_UNKNOWN;
#else
if (0 == streamIndex) {
// stream 0 is reserved for the container
diff --git a/src/itf/IVirtualizer.c b/src/itf/IVirtualizer.c
index 70e2295..c640811 100644
--- a/src/itf/IVirtualizer.c
+++ b/src/itf/IVirtualizer.c
@@ -64,27 +64,27 @@
{
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 @@
{
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/tests/native-media/jni/native-media-jni.c b/tests/native-media/jni/native-media-jni.c
index a43cb9e..6d7ec28 100644
--- a/tests/native-media/jni/native-media-jni.c
+++ b/tests/native-media/jni/native-media-jni.c
@@ -445,7 +445,7 @@
// 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/tools/hashgen/Makefile b/tools/hashgen/Makefile
index b9db863..525e2f9 100644
--- a/tools/hashgen/Makefile
+++ b/tools/hashgen/Makefile
@@ -58,7 +58,7 @@
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
