summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorMarco Nelissen <marcone@google.com>2014-10-20 21:04:04 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-10-20 21:04:04 +0000
commit9cf809cc909e31e53c5a9ac22481e2481817a01c (patch)
tree4253a0669346f4cc5e8832310ea1f451a1752bbc /services
parent7ae605a56b9b1fd7a2cb75d4b742f5673e3fd5dc (diff)
parentac302143551a8b964f026385a524dda9ff8ea5ba (diff)
downloadframeworks_av-9cf809cc909e31e53c5a9ac22481e2481817a01c.zip
frameworks_av-9cf809cc909e31e53c5a9ac22481e2481817a01c.tar.gz
frameworks_av-9cf809cc909e31e53c5a9ac22481e2481817a01c.tar.bz2
am ac302143: Fix the fix
* commit 'ac302143551a8b964f026385a524dda9ff8ea5ba': Fix the fix
Diffstat (limited to 'services')
-rw-r--r--services/audioflinger/Threads.cpp4
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