diff options
| author | Eric Laurent <elaurent@google.com> | 2014-11-04 02:37:03 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-11-04 02:37:03 +0000 |
| commit | ed1e55c5276a1c031e9b2f016387c7d2fe7bc47f (patch) | |
| tree | daa44e7941703765a4d37c0207df8e12959b66c8 /services | |
| parent | 461b02d3eccefea48fa15c67a9cd3a5895bd2765 (diff) | |
| parent | b10352f4bc11ae6f3d93e464074709555ecf9e06 (diff) | |
| download | frameworks_av-ed1e55c5276a1c031e9b2f016387c7d2fe7bc47f.zip frameworks_av-ed1e55c5276a1c031e9b2f016387c7d2fe7bc47f.tar.gz frameworks_av-ed1e55c5276a1c031e9b2f016387c7d2fe7bc47f.tar.bz2 | |
Merge "remove some restrictions on effect output channels" into lmp-mr1-dev
Diffstat (limited to 'services')
| -rw-r--r-- | services/audioflinger/AudioFlinger.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/services/audioflinger/AudioFlinger.cpp b/services/audioflinger/AudioFlinger.cpp index 7b65de7..ea9d7d3 100644 --- a/services/audioflinger/AudioFlinger.cpp +++ b/services/audioflinger/AudioFlinger.cpp @@ -2633,7 +2633,8 @@ status_t AudioFlinger::moveEffectChain_l(int sessionId, // Check whether the destination thread has a channel count of FCC_2, which is // currently required for (most) effects. Prevent moving the effect chain here rather // than disabling the addEffect_l() call in dstThread below. - if (dstThread->mChannelCount != FCC_2) { + if ((dstThread->type() == ThreadBase::MIXER || dstThread->type() == ThreadBase::DUPLICATING) && + dstThread->mChannelCount != FCC_2) { ALOGW("moveEffectChain_l() effect chain failed because" " destination thread %p channel count(%u) != %u", dstThread, dstThread->mChannelCount, FCC_2); |