Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b7092547 authored by Eric Laurent's avatar Eric Laurent Committed by android-build-merger
Browse files

Merge "remove some restrictions on effect output channels" into lmp-mr1-dev 

automerge: ed1e55c5

* commit 'ed1e55c5':
  remove some restrictions on effect output channels
parents 5ae9280b ed1e55c5

services/audioflinger/AudioFlinger.cpp

+2 −1
Original line number Diff line number Diff line
@@ -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);