diff options
author | Brad Fitzpatrick <bradfitz@android.com> | 2011-02-04 10:27:54 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2011-02-04 10:27:54 -0800 |
commit | f664d6f916516860d3e4cf82339d47c6f4fd24a2 (patch) | |
tree | 8c00d6f426ae0df0d39e9669e4de55069d25909b /services | |
parent | 6dbdcd55905e50e533d0d3d9abf735275bca68b6 (diff) | |
parent | b083d3b816378ef3b9dceb33b2c2e20510b2632b (diff) | |
download | frameworks_base-f664d6f916516860d3e4cf82339d47c6f4fd24a2.zip frameworks_base-f664d6f916516860d3e4cf82339d47c6f4fd24a2.tar.gz frameworks_base-f664d6f916516860d3e4cf82339d47c6f4fd24a2.tar.bz2 |
am b083d3b8: Merge "Initialize resampling buffer per track."
* commit 'b083d3b816378ef3b9dceb33b2c2e20510b2632b':
Initialize resampling buffer per track.
Diffstat (limited to 'services')
-rw-r--r-- | services/audioflinger/AudioMixer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/audioflinger/AudioMixer.cpp b/services/audioflinger/AudioMixer.cpp index 8aaa325..433f1f7 100644 --- a/services/audioflinger/AudioMixer.cpp +++ b/services/audioflinger/AudioMixer.cpp @@ -975,7 +975,6 @@ void AudioMixer::process__genericResampling(state_t* state) { int32_t* const outTemp = state->outputTemp; const size_t size = sizeof(int32_t) * MAX_NUM_CHANNELS * state->frameCount; - memset(outTemp, 0, size); size_t numFrames = state->frameCount; @@ -997,6 +996,7 @@ void AudioMixer::process__genericResampling(state_t* state) } e0 &= ~(e1); int32_t *out = t1.mainBuffer; + memset(outTemp, 0, size); while (e1) { const int i = 31 - __builtin_clz(e1); e1 &= ~(1<<i); |