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

Merge "Issue 5247986: Battery drain due to audio wakelock"

Browse Source
This commit is contained in:
Eric Laurent
2011-09-06 14:53:59 -07:00
committed by Android (Google) Code Review
parent fa6067f87c b0808f9c43
commit b6738fc6a5
1 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
media/libmedia/AudioTrack.cpp
View File

@@ -1182,16 +1182,33 @@ status_t AudioTrack::restoreTrack_l(audio_track_cblk_t*& cblk, bool fromStart)
false); false);
if (result == NO_ERROR) { if (result == NO_ERROR) {
uint32_t user = cblk->user;
uint32_t server = cblk->server;
// restore write index and set other indexes to reflect empty buffer status // restore write index and set other indexes to reflect empty buffer status
mCblk->user = cblk->user; mCblk->user = user;
mCblk->server = cblk->user; mCblk->server = user;
mCblk->userBase = cblk->user; mCblk->userBase = user;
mCblk->serverBase = cblk->user; mCblk->serverBase = user;
// restore loop: this is not guaranteed to succeed if new frame count is not // restore loop: this is not guaranteed to succeed if new frame count is not
// compatible with loop length // compatible with loop length
setLoop_l(cblk->loopStart, cblk->loopEnd, cblk->loopCount); setLoop_l(cblk->loopStart, cblk->loopEnd, cblk->loopCount);
if (!fromStart) { if (!fromStart) {
mCblk->bufferTimeoutMs = MAX_RUN_TIMEOUT_MS; mCblk->bufferTimeoutMs = MAX_RUN_TIMEOUT_MS;
// Make sure that a client relying on callback events indicating underrun or
// the actual amount of audio frames played (e.g SoundPool) receives them.
if (mSharedBuffer == 0) {
uint32_t frames = 0;
if (user > server) {
frames = ((user - server) > mCblk->frameCount) ?
mCblk->frameCount : (user - server);
memset(mCblk->buffers, 0, frames * mCblk->frameSize);
}
// restart playback even if buffer is not completely filled.
android_atomic_or(CBLK_FORCEREADY_ON, &mCblk->flags);
// stepUser() clears CBLK_UNDERRUN_ON flag enabling underrun callbacks to
// the client
mCblk->stepUser(frames);
}
} }
if (mActive) { if (mActive) {
result = mAudioTrack->start(); result = mAudioTrack->start();