diff options
| author | Marco Nelissen <marcone@google.com> | 2014-10-20 21:25:25 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-20 21:25:25 +0000 |
| commit | 97502a19165de566eaf7525b6967f84adc8aabce (patch) | |
| tree | e7413f4a341ae516094889db26491cb68273413a | |
| parent | 791854d962d8fd53dc267f73bfbd474a8887a1d1 (diff) | |
| parent | 9f38361fa0ba8fe04b9ba7e21bf25abe20620800 (diff) | |
| download | frameworks_av-97502a19165de566eaf7525b6967f84adc8aabce.zip frameworks_av-97502a19165de566eaf7525b6967f84adc8aabce.tar.gz frameworks_av-97502a19165de566eaf7525b6967f84adc8aabce.tar.bz2 | |
am 9f38361f: am 5cc72274: am d61ba0aa: am 36d9256f: am ac302143: Fix the fix
* commit '9f38361fa0ba8fe04b9ba7e21bf25abe20620800':
Fix the fix
| -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 ceef6e7..6b9da83 100644 --- a/services/audioflinger/Threads.cpp +++ b/services/audioflinger/Threads.cpp @@ -3671,11 +3671,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 |