diff options
author | Marco Nelissen <marcone@google.com> | 2014-10-20 14:54:56 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-20 14:54:56 +0000 |
commit | 0cfc8f2500bb76d44ad45a723a570835aeff502b (patch) | |
tree | 37d3758e31767c92dec100efc9c93ff8d3fc156b /services | |
parent | dfe7616237240e8a5c4cb26ba395be70bd898cbd (diff) | |
parent | 145a4c679a9ab27aceaa1d386ea9aca1c0cd4d33 (diff) | |
download | frameworks_av-0cfc8f2500bb76d44ad45a723a570835aeff502b.zip frameworks_av-0cfc8f2500bb76d44ad45a723a570835aeff502b.tar.gz frameworks_av-0cfc8f2500bb76d44ad45a723a570835aeff502b.tar.bz2 |
am 145a4c67: am 22bc10a3: Merge "Clear effect buffer before sending to chain" into lmp-dev
* commit '145a4c679a9ab27aceaa1d386ea9aca1c0cd4d33':
Clear effect buffer before sending to chain
Diffstat (limited to 'services')
-rw-r--r-- | services/audioflinger/Threads.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/services/audioflinger/Threads.cpp b/services/audioflinger/Threads.cpp index 44e34b7..fa20752 100644 --- a/services/audioflinger/Threads.cpp +++ b/services/audioflinger/Threads.cpp @@ -3670,6 +3670,9 @@ track_is_ready: ; if (getEffectChain_l(AUDIO_SESSION_OUTPUT_MIX) != 0) { mEffectBufferValid = true; + // as long as there are effects we should clear the effects buffer, to avoid + // passing a non-clean buffer to the effect chain + memset(mEffectBuffer, 0, mEffectBufferSize); } // sink or mix buffer must be cleared if all tracks are connected to an @@ -3690,10 +3693,6 @@ track_is_ready: ; // must imply MIXER_TRACKS_READY. // Later, we may clear buffers regardless, and skip much of this logic. } - // TODO - either mEffectBuffer or mSinkBuffer needs to be cleared. - if (mEffectBufferValid) { - memset(mEffectBuffer, 0, mEffectBufferSize); - } // FIXME as a performance optimization, should remember previous zero status memset(mSinkBuffer, 0, mNormalFrameCount * mFrameSize); } |