commit 0662f7b6735df0a140f6512285d05f8f9a38bb98
author Lajos Molnar <lajos@google.com> Wed Jun 12 16:27:40 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jun 12 16:27:40 2013 +0000
tree 6b3c887f61122cbec3bbd4ef5aa21064d6cbb369
parent 7be48189c0aefb82825a7689d9e1005175570779
parent 577db6d42b8d83b3578c7e56b1391bdaca9cb705

Merge "stagefright: synchronously change nativewindow crop" into jb-mr2-dev

services/audioflinger/Threads.cpp

diff --git a/services/audioflinger/Threads.cpp b/services/audioflinger/Threads.cpp
index 6422b23..97f66f4 100644
--- a/services/audioflinger/Threads.cpp
+++ b/services/audioflinger/Threads.cpp
@@ -1330,13 +1330,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;