Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "bootanimation: fix glitchy playback" into nyc-mr1-dev

Browse Source
This commit is contained in:
Eric Laurent
2016-07-22 20:23:56 +00:00
committed by Android (Google) Code Review
parent db56fb36a6 197e47979a
commit acf0e702f2
1 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
cmds/bootanimation/audioplay.cpp
View File

@@ -20,6 +20,7 @@
#include "audioplay.h" #include "audioplay.h"
#define CHATTY ALOGD #define CHATTY ALOGD
#define LOG_TAG "audioplay"
#include <string.h> #include <string.h>
@@ -114,10 +115,8 @@ bool createEngine() {
} }
(void)result; (void)result;
// create output mix, with environmental reverb specified as a non-required interface // create output mix
const SLInterfaceID ids[1] = {SL_IID_ENVIRONMENTALREVERB}; result = (*engineEngine)->CreateOutputMix(engineEngine, &outputMixObject, 0, NULL, NULL);
const SLboolean req[1] = {SL_BOOLEAN_FALSE};
result = (*engineEngine)->CreateOutputMix(engineEngine, &outputMixObject, 1, ids, req);
if (result != SL_RESULT_SUCCESS) { if (result != SL_RESULT_SUCCESS) {
ALOGE("sl engine CreateOutputMix failed with result %d", result); ALOGE("sl engine CreateOutputMix failed with result %d", result);
return false; return false;
@@ -183,6 +182,14 @@ bool createBufferQueueAudioPlayer(const ChunkFormat* chunkFormat) {
ALOGE("SetConfiguration failed with result %d", result); ALOGE("SetConfiguration failed with result %d", result);
return false; return false;
} }
// use normal performance mode as low latency is not needed. This is not mandatory so
// do not bail if we fail
SLuint32 performanceMode = SL_ANDROID_PERFORMANCE_NONE;
result = (*playerConfig)->SetConfiguration(
playerConfig, SL_ANDROID_KEY_PERFORMANCE_MODE, &performanceMode, sizeof(SLuint32));
ALOGW_IF(result != SL_RESULT_SUCCESS,
"could not set performance mode on player, error %d", result);
(void)result;
// realize the player // realize the player
result = (*bqPlayerObject)->Realize(bqPlayerObject, SL_BOOLEAN_FALSE); result = (*bqPlayerObject)->Realize(bqPlayerObject, SL_BOOLEAN_FALSE);
@@ -264,6 +271,7 @@ bool parseClipBuf(const uint8_t* clipBuf, int clipBufSize, const ChunkFormat** o
break; break;
case ID_DATA: case ID_DATA:
/* Stop looking for chunks */ /* Stop looking for chunks */
*oSoundBufSize = chunkHeader->sz;
endLoop = true; endLoop = true;
break; break;
default: default:
@@ -317,7 +325,8 @@ bool playClip(const uint8_t* buf, int size) {
return false; return false;
} }
CHATTY("playClip on player %p: buf=%p size=%d", bqPlayerBufferQueue, buf, size); CHATTY("playClip on player %p: buf=%p size=%d nextSize %d",
bqPlayerBufferQueue, buf, size, nextSize);
if (nextSize > 0) { if (nextSize > 0) {
// here we only enqueue one buffer because it is a long clip, // here we only enqueue one buffer because it is a long clip,