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

Commit 3fd6a2cc authored by Eric Laurent's avatar Eric Laurent
Browse files

Revert "Audio effects: define interface between EffectModule and audio framework" 

This reverts commit c0abc623.

Reason for revert: broken build on target cf_x86_phone-userdebug_coverage

Change-Id: Ic6808bfd31bedfa85b7d7a120e4c6f6273678f73
parent c0abc623

services/audioflinger/AudioFlinger.cpp

+4 −4
Original line number Diff line number Diff line
@@ -2996,7 +2996,7 @@ std::vector<sp<AudioFlinger::EffectModule>> AudioFlinger::purgeStaleEffects_l() 
    for (size_t i = 0; i < chains.size(); i++) {

        sp<EffectChain> ec = chains[i];

        int sessionid = ec->sessionId();

        sp<ThreadBase> t = ec->thread().promote();

        sp<ThreadBase> t = ec->mThread.promote();

        if (t == 0) {

            continue;

        }
@@ -3019,7 +3019,7 @@ std::vector<sp<AudioFlinger::EffectModule>> AudioFlinger::purgeStaleEffects_l() 
                effect->unPin();

                t->removeEffect_l(effect, /*release*/ true);

                if (effect->purgeHandles()) {

                    effect->checkSuspendOnEffectEnabled(false, true /*threadLocked*/);

                    t->checkSuspendOnEffectEnabled_l(effect, false, effect->sessionId());

                }

                removedEffects.push_back(effect);

            }
@@ -3642,7 +3642,7 @@ status_t AudioFlinger::moveEffectChain_l(audio_session_t sessionId, 
        // if the move request is not received from audio policy manager, the effect must be

        // re-registered with the new strategy and output

        if (dstChain == 0) {

            dstChain = effect->callback()->chain().promote();

            dstChain = effect->chain().promote();

            if (dstChain == 0) {

                ALOGW("moveEffectChain_l() cannot get chain from effect %p", effect.get());

                status = NO_INIT;
@@ -3692,7 +3692,7 @@ status_t AudioFlinger::moveAuxEffectToIo(int EffectId, 
            goto Exit;

        }



        dstChain = effect->callback()->chain().promote();

        dstChain = effect->chain().promote();

        if (dstChain == 0) {

            thread->addEffect_l(effect);

            status = INVALID_OPERATION;