am b083d3b8: Merge "Initialize resampling buffer per track."

* commit 'b083d3b816378ef3b9dceb33b2c2e20510b2632b':
  Initialize resampling buffer per track.
This commit is contained in:
Brad Fitzpatrick
2011-02-04 10:27:54 -08:00
committed by Android Git Automerger

View File

@ -975,7 +975,6 @@ void AudioMixer::process__genericResampling(state_t* state)
{ {
int32_t* const outTemp = state->outputTemp; int32_t* const outTemp = state->outputTemp;
const size_t size = sizeof(int32_t) * MAX_NUM_CHANNELS * state->frameCount; const size_t size = sizeof(int32_t) * MAX_NUM_CHANNELS * state->frameCount;
memset(outTemp, 0, size);
size_t numFrames = state->frameCount; size_t numFrames = state->frameCount;
@ -997,6 +996,7 @@ void AudioMixer::process__genericResampling(state_t* state)
} }
e0 &= ~(e1); e0 &= ~(e1);
int32_t *out = t1.mainBuffer; int32_t *out = t1.mainBuffer;
memset(outTemp, 0, size);
while (e1) { while (e1) {
const int i = 31 - __builtin_clz(e1); const int i = 31 - __builtin_clz(e1);
e1 &= ~(1<<i); e1 &= ~(1<<i);