summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@google.com>2015-05-28 09:35:12 -0700
committerGlenn Kasten <gkasten@google.com>2015-05-28 11:41:43 -0700
commit64c3fe7bd86951eeac27adca2219ce16eabff58c (patch)
tree627cda1d8589f17ee75d3383894a4cfdbbcb02bf
parentd2a31043966c76e4739bb325edcd5a475861a951 (diff)
downloadandroid_frameworks_wilhelm-64c3fe7bd86951eeac27adca2219ce16eabff58c.tar.gz
android_frameworks_wilhelm-64c3fe7bd86951eeac27adca2219ce16eabff58c.tar.bz2
android_frameworks_wilhelm-64c3fe7bd86951eeac27adca2219ce16eabff58c.zip
Whitespace
Change-Id: I666963a80530aceec9f47e625018844daf29c017
-rw-r--r--src/android/AudioPlayer_to_android.cpp4
-rw-r--r--src/android/android_sles_conversions.h20
-rw-r--r--src/itf/IEngine.c3
3 files changed, 13 insertions, 14 deletions
diff --git a/src/android/AudioPlayer_to_android.cpp b/src/android/AudioPlayer_to_android.cpp
index 1647a34..8b58705 100644
--- a/src/android/AudioPlayer_to_android.cpp
+++ b/src/android/AudioPlayer_to_android.cpp
@@ -124,7 +124,7 @@ static size_t adecoder_writeToBufferQueue(const uint8_t *data, size_t size, CAud
// room to consume the whole or rest of the decoded data in one shot
ap->mBufferQueue.mSizeConsumed += size;
// consume data but no callback to the BufferQueue interface here
- memcpy (pDest, data, size);
+ memcpy(pDest, data, size);
sizeConsumed = size;
} else {
// push as much as possible of the decoded data into the buffer queue
@@ -140,7 +140,7 @@ static size_t adecoder_writeToBufferQueue(const uint8_t *data, size_t size, CAud
ap->mBufferQueue.mState.count--;
ap->mBufferQueue.mState.playIndex++;
// consume data
- memcpy (pDest, data, sizeConsumed);
+ memcpy(pDest, data, sizeConsumed);
// data has been copied to the buffer, and the buffer queue state has been updated
// we will notify the client if applicable
callback = ap->mBufferQueue.mCallback;
diff --git a/src/android/android_sles_conversions.h b/src/android/android_sles_conversions.h
index 8e07237..89552b1 100644
--- a/src/android/android_sles_conversions.h
+++ b/src/android/android_sles_conversions.h
@@ -48,16 +48,16 @@ static inline audio_format_t sles_to_android_sampleFormat(const SLDataFormat_PCM
switch (df_pcm->formatType) {
case SL_DATAFORMAT_PCM:
switch (df_pcm->containerSize) {
- case 8:
- return AUDIO_FORMAT_PCM_8_BIT;
- case 16:
- return AUDIO_FORMAT_PCM_16_BIT;
- case 24:
- return AUDIO_FORMAT_PCM_24_BIT_PACKED;
- case 32:
- return AUDIO_FORMAT_PCM_32_BIT;
- default:
- return AUDIO_FORMAT_INVALID;
+ case 8:
+ return AUDIO_FORMAT_PCM_8_BIT;
+ case 16:
+ return AUDIO_FORMAT_PCM_16_BIT;
+ case 24:
+ return AUDIO_FORMAT_PCM_24_BIT_PACKED;
+ case 32:
+ return AUDIO_FORMAT_PCM_32_BIT;
+ default:
+ return AUDIO_FORMAT_INVALID;
}
case SL_ANDROID_DATAFORMAT_PCM_EX:
switch (((SLAndroidDataFormat_PCM_EX *)df_pcm)->representation) {
diff --git a/src/itf/IEngine.c b/src/itf/IEngine.c
index 4ff32c9..d1b05bf 100644
--- a/src/itf/IEngine.c
+++ b/src/itf/IEngine.c
@@ -1201,8 +1201,7 @@ static XAresult IEngine_CreateMediaPlayer(XAEngineItf self, XAObjectItf *pPlayer
XAMediaContainerInformation *containerInfo =
(XAMediaContainerInformation*)
// always storing container info at index 0, as per spec
- &(thiz->mStreamInfo.mStreamInfoTable.itemAt(0).
- containerInfo);
+ &thiz->mStreamInfo.mStreamInfoTable.itemAt(0).containerInfo;
containerInfo->containerType = XA_CONTAINERTYPE_MPEG_TS;
// there are no streams at this stage
containerInfo->numStreams = 0;