diff options
| author | Eric Laurent <elaurent@google.com> | 2010-07-29 07:46:03 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-07-29 07:46:03 -0700 |
| commit | efd58e5fd0ef211eb823b7a9f8ff6fa13824611c (patch) | |
| tree | 7d91e24c2915957fb7c637cb243d136bca1fa1e1 /services/audioflinger | |
| parent | e199f1dddb513c05e3c7c6ce2c71dc295876a64a (diff) | |
| parent | ba676a00c1b9ba59b30fe805b83d03d1768fffbd (diff) | |
| download | frameworks_base-efd58e5fd0ef211eb823b7a9f8ff6fa13824611c.zip frameworks_base-efd58e5fd0ef211eb823b7a9f8ff6fa13824611c.tar.gz frameworks_base-efd58e5fd0ef211eb823b7a9f8ff6fa13824611c.tar.bz2 | |
am ba676a00: am a54d7d3d: Fixed underrun in audioflinger mixer.
Merge commit 'ba676a00c1b9ba59b30fe805b83d03d1768fffbd'
* commit 'ba676a00c1b9ba59b30fe805b83d03d1768fffbd':
Fixed underrun in audioflinger mixer.
Diffstat (limited to 'services/audioflinger')
| -rw-r--r-- | services/audioflinger/AudioFlinger.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/services/audioflinger/AudioFlinger.cpp b/services/audioflinger/AudioFlinger.cpp index 4a7243f..252b42a 100644 --- a/services/audioflinger/AudioFlinger.cpp +++ b/services/audioflinger/AudioFlinger.cpp @@ -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; } |