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 | e679114b6c7e087a59c2b2c3b55603c43da4ef38 (patch) | |
| tree | 27eabc001f4ab0bd0d8c3827ae773982f9536343 /services | |
| parent | cc759794489c2c39aaef229fba4ace32e394bb81 (diff) | |
| parent | 24fd262e7c16d391ce1c5a8835a83677d099445f (diff) | |
| download | frameworks_av-e679114b6c7e087a59c2b2c3b55603c43da4ef38.zip frameworks_av-e679114b6c7e087a59c2b2c3b55603c43da4ef38.tar.gz frameworks_av-e679114b6c7e087a59c2b2c3b55603c43da4ef38.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')
| -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; } |