summaryrefslogtreecommitdiffstats
path: root/services/audioflinger/Effects.cpp
diff options
context:
space:
mode:
authorJean-Michel Trivi <jmtrivi@google.com>2013-09-30 14:13:39 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-09-30 14:13:39 -0700
commit98232ab7c20bfbdfe176d2c25bb810dbb5e7b4f1 (patch)
tree1c7a424cd5c6592a4253cb8b9f9779e193d61262 /services/audioflinger/Effects.cpp
parenta6c7d98033c161592a062c61eaa6b7fd635e3006 (diff)
parenta2340b3059b9d6e4286d0db7069df477c164df0c (diff)
downloadframeworks_av-98232ab7c20bfbdfe176d2c25bb810dbb5e7b4f1.zip
frameworks_av-98232ab7c20bfbdfe176d2c25bb810dbb5e7b4f1.tar.gz
frameworks_av-98232ab7c20bfbdfe176d2c25bb810dbb5e7b4f1.tar.bz2
am a2340b30: Merge "Don\'t call audio effect process on offloaded playback threads" into klp-dev
* commit 'a2340b3059b9d6e4286d0db7069df477c164df0c': Don't call audio effect process on offloaded playback threads
Diffstat (limited to 'services/audioflinger/Effects.cpp')
-rw-r--r--services/audioflinger/Effects.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/services/audioflinger/Effects.cpp b/services/audioflinger/Effects.cpp
index c6e78a6..7644de6 100644
--- a/services/audioflinger/Effects.cpp
+++ b/services/audioflinger/Effects.cpp
@@ -1280,9 +1280,10 @@ void AudioFlinger::EffectChain::process_l()
}
bool isGlobalSession = (mSessionId == AUDIO_SESSION_OUTPUT_MIX) ||
(mSessionId == AUDIO_SESSION_OUTPUT_STAGE);
- // always process effects unless no more tracks are on the session and the effect tail
- // has been rendered
- bool doProcess = true;
+ // never process effects when:
+ // - on an OFFLOAD thread
+ // - no more tracks are on the session and the effect tail has been rendered
+ bool doProcess = (thread->type() != ThreadBase::OFFLOAD);
if (!isGlobalSession) {
bool tracksOnSession = (trackCnt() != 0);