am ba676a00: am a54d7d3d: Fixed underrun in audioflinger mixer.

Merge commit 'ba676a00c1b9ba59b30fe805b83d03d1768fffbd'

* commit 'ba676a00c1b9ba59b30fe805b83d03d1768fffbd':
  Fixed underrun in audioflinger mixer.
This commit is contained in:
Eric Laurent
2010-07-29 07:46:03 -07:00
committed by Android Git Automerger

View File

@@ -2015,7 +2015,7 @@ uint32_t AudioFlinger::MixerThread::activeSleepTimeUs()
uint32_t AudioFlinger::MixerThread::idleSleepTimeUs()
{
return (uint32_t)((mFrameCount * 1000) / mSampleRate) * 1000;
return (uint32_t)(((mFrameCount * 1000) / mSampleRate) * 1000) / 2;
}
// ----------------------------------------------------------------------------
@@ -2476,7 +2476,7 @@ uint32_t AudioFlinger::DirectOutputThread::idleSleepTimeUs()
{
uint32_t time;
if (AudioSystem::isLinearPCM(mFormat)) {
time = (uint32_t)((mFrameCount * 1000) / mSampleRate) * 1000;
time = (uint32_t)(((mFrameCount * 1000) / mSampleRate) * 1000) / 2;
} else {
time = 10000;
}