commit fe9a901a445633e70073b1b91fca3af34d8e8132
author Eric Laurent <elaurent@google.com> Wed Jun 12 08:47:34 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Jun 12 08:47:34 2013 -0700
tree 41236b49070c051fb562c5919b827440cc53f610
parent d8af57f8c2715dd06f49f6003afa2f41437fefa3
parent bb35be24239f05f59715960a93cd491a4cd3b4d6

am bb35be24: am 7be48189: Merge "audioflinger: fix effects on direct output threads" into jb-mr2-dev

* commit 'bb35be24239f05f59715960a93cd491a4cd3b4d6':
  audioflinger: fix effects on direct output threads

services/audioflinger/Threads.cpp

diff --git a/services/audioflinger/Threads.cpp b/services/audioflinger/Threads.cpp
index 0f0bc0f..ee52fcb 100644
--- a/services/audioflinger/Threads.cpp
+++ b/services/audioflinger/Threads.cpp
@@ -1331,13 +1331,11 @@
         track->mResetDone = false;
         track->mPresentationCompleteFrames = 0;
         mActiveTracks.add(track);
-        if (track->mainBuffer() != mMixBuffer) {
-            sp<EffectChain> chain = getEffectChain_l(track->sessionId());
-            if (chain != 0) {
-                ALOGV("addTrack_l() starting track on chain %p for session %d", chain.get(),
-                        track->sessionId());
-                chain->incActiveTrackCnt();
-            }
+        sp<EffectChain> chain = getEffectChain_l(track->sessionId());
+        if (chain != 0) {
+            ALOGV("addTrack_l() starting track on chain %p for session %d", chain.get(),
+                    track->sessionId());
+            chain->incActiveTrackCnt();
         }
 
         status = NO_ERROR;