diff options
| author | Brad Fitzpatrick <bradfitz@android.com> | 2011-02-04 10:32:50 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-02-04 10:32:50 -0800 |
| commit | e08d819989d394ed171ba6f1e6d0fa14c29fc42d (patch) | |
| tree | 17e548e1a86710ac25d23c141cba4d429f822f89 /services | |
| parent | 1bca832a1e023988a0103e3d87a47c96bfa0045a (diff) | |
| parent | e26308ad434c575b2985ac442d2990bb1bc19f5d (diff) | |
| download | frameworks_av-e08d819989d394ed171ba6f1e6d0fa14c29fc42d.zip frameworks_av-e08d819989d394ed171ba6f1e6d0fa14c29fc42d.tar.gz frameworks_av-e08d819989d394ed171ba6f1e6d0fa14c29fc42d.tar.bz2 | |
am cc8f87e9: am f664d6f9: am b083d3b8: Merge "Initialize resampling buffer per track."
* commit 'cc8f87e9410dd4de9a2fda4738429e6c6087c789':
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); |