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

am 54c06152: Merge change 24872 into eclair

Browse Source 
Merge commit '54c06152e0d9c666aec61ae5d9686d7d3327ea34' into eclair-plus-aosp

* commit '54c06152e0d9c666aec61ae5d9686d7d3327ea34':
  Fix issue 2115450: a2dp thread is started, even though we are only connected to headset and not playing music.
This commit is contained in:
Eric Laurent
2009-09-14 23:33:23 -07:00
committed by Android Git Automerger
parent 1c3d36ec6c 54c06152e0
commit ce063a3510
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libs/audioflinger/AudioFlinger.cpp
View File

@@ -1239,7 +1239,7 @@ bool AudioFlinger::MixerThread::threadLoop()
// active tracks were late. Sleep a little bit to give
// them another chance. If we're too late, write 0s to audio
// hardware to avoid underrun.
if (sleepTime < kMaxBufferRecoveryInUsecs) {
if (mBytesWritten == 0 || sleepTime < kMaxBufferRecoveryInUsecs) {
usleep(kBufferRecoveryInUsecs);
} else {
memset (curBuf, 0, mixBufferSize);
@@ -1741,7 +1741,8 @@ bool AudioFlinger::DirectOutputThread::threadLoop()
standbyTime = systemTime() + kStandbyTimeInNsecs;
} else {
sleepTime += kBufferRecoveryInUsecs;
if (sleepTime < kMaxBufferRecoveryInUsecs) {
if (mBytesWritten == 0 || !AudioSystem::isLinearPCM(mFormat) ||
sleepTime < kMaxBufferRecoveryInUsecs) {
usleep(kBufferRecoveryInUsecs);
} else {
memset (mMixBuffer, 0, mFrameCount * mFrameSize);