diff options
| author | Eric Laurent <elaurent@google.com> | 2014-11-03 16:25:39 -0800 |
|---|---|---|
| committer | Eric Laurent <elaurent@google.com> | 2014-11-03 16:25:39 -0800 |
| commit | b10352f4bc11ae6f3d93e464074709555ecf9e06 (patch) | |
| tree | 52187ad264691c11e3d1efc541fe791568a33d69 /services/audioflinger/AudioFlinger.cpp | |
| parent | b1322c78b035c9f47ebe57a39799d7a0e13bf57f (diff) | |
| download | frameworks_av-b10352f4bc11ae6f3d93e464074709555ecf9e06.zip frameworks_av-b10352f4bc11ae6f3d93e464074709555ecf9e06.tar.gz frameworks_av-b10352f4bc11ae6f3d93e464074709555ecf9e06.tar.bz2 | |
remove some restrictions on effect output channels
Do not prevent from attaching effects to a non stereo
output thread, unless the output thread is a mixer thread.
Bug: 18157592.
Change-Id: I6ac3187187a1b8aade7db04ea6dfbc47dacc25c3
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 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); |