diff options
| author | Eric Laurent <elaurent@google.com> | 2014-11-04 03:27:59 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-04 03:27:59 +0000 |
| commit | 298c4dc7e90cae4873d89098b777d1068a4e35ea (patch) | |
| tree | 7dcf27d59c46667f171e8bbeb5dccdbb536b515a /services/audioflinger/AudioFlinger.cpp | |
| parent | 123a2deac738bc9c3a1cc35cd3dc7f8f91302c36 (diff) | |
| parent | d202ac37fc1f5f31e180af55cebd22810a80251b (diff) | |
| download | frameworks_av-298c4dc7e90cae4873d89098b777d1068a4e35ea.zip frameworks_av-298c4dc7e90cae4873d89098b777d1068a4e35ea.tar.gz frameworks_av-298c4dc7e90cae4873d89098b777d1068a4e35ea.tar.bz2 | |
am d202ac37: am b7092547: Merge "remove some restrictions on effect output channels" into lmp-mr1-dev automerge: ed1e55c
* commit 'd202ac37fc1f5f31e180af55cebd22810a80251b':
remove some restrictions on effect output channels
Diffstat (limited to 'services/audioflinger/AudioFlinger.cpp')
| -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 a23a729..115b60c 100644 --- a/services/audioflinger/AudioFlinger.cpp +++ b/services/audioflinger/AudioFlinger.cpp @@ -2636,7 +2636,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); |