diff options
author | Marco Nelissen <marcone@google.com> | 2014-10-20 21:05:02 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-20 21:05:02 +0000 |
commit | 36d9256f956b2ed4d7a221d84ad05bf4ba482958 (patch) | |
tree | bc20d87abb869e949cb479a1311b676e5b04f8bb /services/audioflinger | |
parent | 145a4c679a9ab27aceaa1d386ea9aca1c0cd4d33 (diff) | |
parent | ac302143551a8b964f026385a524dda9ff8ea5ba (diff) | |
download | frameworks_av-36d9256f956b2ed4d7a221d84ad05bf4ba482958.zip frameworks_av-36d9256f956b2ed4d7a221d84ad05bf4ba482958.tar.gz frameworks_av-36d9256f956b2ed4d7a221d84ad05bf4ba482958.tar.bz2 |
am ac302143: Fix the fix
* commit 'ac302143551a8b964f026385a524dda9ff8ea5ba':
Fix the fix
Diffstat (limited to 'services/audioflinger')
-rw-r--r-- | services/audioflinger/Threads.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/services/audioflinger/Threads.cpp b/services/audioflinger/Threads.cpp index fa20752..e443476 100644 --- a/services/audioflinger/Threads.cpp +++ b/services/audioflinger/Threads.cpp @@ -3670,11 +3670,13 @@ track_is_ready: ; if (getEffectChain_l(AUDIO_SESSION_OUTPUT_MIX) != 0) { mEffectBufferValid = true; + } + + if (mEffectBufferValid) { // 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 // effect chain as in this case the mixer will not write to the sink or mix buffer // and track effects will accumulate into it |