Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 404946fc: Merge "Fix issue 3371096." into honeycomb

Browse Source 
* commit '404946fc260e5dff23c8a0db12e33ff842ab4b47':
  Fix issue 3371096.
This commit is contained in:
Eric Laurent
2011-01-20 10:33:29 -08:00
committed by Android Git Automerger
parent 655f6e1026 404946fc26
commit 4dcaeb6d77
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
services/audioflinger/AudioFlinger.cpp
View File

@@ -5443,19 +5443,21 @@ void AudioFlinger::EffectModule::process()
// clear auxiliary effect input buffer for next accumulation // clear auxiliary effect input buffer for next accumulation
if ((mDescriptor.flags & EFFECT_FLAG_TYPE_MASK) == EFFECT_FLAG_TYPE_AUXILIARY) { if ((mDescriptor.flags & EFFECT_FLAG_TYPE_MASK) == EFFECT_FLAG_TYPE_AUXILIARY) {
memset(mConfig.inputCfg.buffer.raw, 0, mConfig.inputCfg.buffer.frameCount*sizeof(int32_t)); memset(mConfig.inputCfg.buffer.raw, 0,
mConfig.inputCfg.buffer.frameCount*sizeof(int32_t));
} }
} else if ((mDescriptor.flags & EFFECT_FLAG_TYPE_MASK) == EFFECT_FLAG_TYPE_INSERT && } else if ((mDescriptor.flags & EFFECT_FLAG_TYPE_MASK) == EFFECT_FLAG_TYPE_INSERT &&
mConfig.inputCfg.buffer.raw != mConfig.outputCfg.buffer.raw){ mConfig.inputCfg.buffer.raw != mConfig.outputCfg.buffer.raw) {
// If an insert effect is idle and input buffer is different from output buffer, copy input to // If an insert effect is idle and input buffer is different from output buffer,
// output // accumulate input onto output
sp<EffectChain> chain = mChain.promote(); sp<EffectChain> chain = mChain.promote();
if (chain != 0 && chain->activeTracks() != 0) { if (chain != 0 && chain->activeTracks() != 0) {
size_t size = mConfig.inputCfg.buffer.frameCount * sizeof(int16_t); size_t frameCnt = mConfig.inputCfg.buffer.frameCount * 2; //always stereo here
if (mConfig.inputCfg.channels == CHANNEL_STEREO) { int16_t *in = mConfig.inputCfg.buffer.s16;
size *= 2; int16_t *out = mConfig.outputCfg.buffer.s16;
for (size_t i = 0; i < frameCnt; i++) {
out[i] = clamp16((int32_t)out[i] + (int32_t)in[i]);
} }
memcpy(mConfig.outputCfg.buffer.raw, mConfig.inputCfg.buffer.raw, size);
} }
} }
} }