diff options
| author | Eric Laurent <elaurent@google.com> | 2013-06-12 08:47:34 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-06-12 08:47:34 -0700 |
| commit | fe9a901a445633e70073b1b91fca3af34d8e8132 (patch) | |
| tree | 41236b49070c051fb562c5919b827440cc53f610 /services | |
| parent | d8af57f8c2715dd06f49f6003afa2f41437fefa3 (diff) | |
| parent | bb35be24239f05f59715960a93cd491a4cd3b4d6 (diff) | |
| download | frameworks_av-fe9a901a445633e70073b1b91fca3af34d8e8132.zip frameworks_av-fe9a901a445633e70073b1b91fca3af34d8e8132.tar.gz frameworks_av-fe9a901a445633e70073b1b91fca3af34d8e8132.tar.bz2 | |
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
Diffstat (limited to 'services')
| -rw-r--r-- | services/audioflinger/Threads.cpp | 12 |
1 files changed, 5 insertions, 7 deletions
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 @@ status_t AudioFlinger::PlaybackThread::addTrack_l(const sp<Track>& track) 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; |