diff options
| author | 2010-07-29 07:43:10 -0700 | |
|---|---|---|
| committer | 2010-07-29 07:43:10 -0700 | |
| commit | ba676a00c1b9ba59b30fe805b83d03d1768fffbd (patch) | |
| tree | f91eb0f847ad32181065cba00e2c24e5e1c4bba3 | |
| parent | 45dc4f82a00e52b12389b22a7cfbbee5609e8e28 (diff) | |
| parent | a54d7d3d7dd691334189aab20d23c65710092869 (diff) | |
am a54d7d3d: Fixed underrun in audioflinger mixer.
Merge commit 'a54d7d3d7dd691334189aab20d23c65710092869' into gingerbread-plus-aosp
* commit 'a54d7d3d7dd691334189aab20d23c65710092869':
Fixed underrun in audioflinger mixer.
| -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 4a7243f1d392..252b42ab097f 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; } |