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

Commit f10c709f authored by Eric Laurent's avatar Eric Laurent
Browse files

audio policy: remove effects before releasing input 

modify releaseInput() implementation so that effects added by policy
rules are removed before closing the input stream to avoid
failure to destroy the effect chain

make sure that orphan effect chains are checked when an EffectHandle is
disconnected after thread destruction.

Test: make and run Hangouts
Bug: 32707507

Change-Id: I7833b4c5e42c0057a4477eb4485a20dd26ca2f90
parent 7cdef381

services/audioflinger/Effects.cpp

+25 −0
Original line number Diff line number Diff line
@@ -207,6 +207,24 @@ AudioFlinger::EffectHandle *AudioFlinger::EffectModule::controlHandle_l() 
    return NULL;

}



// unsafe method called when the effect parent thread has been destroyed

ssize_t AudioFlinger::EffectModule::disconnectHandle(EffectHandle *handle, bool unpinIfLast)

{

    ALOGV("disconnect() %p handle %p", this, handle);

    Mutex::Autolock _l(mLock);

    ssize_t numHandles = removeHandle_l(handle);

    if ((numHandles == 0) && (!mPinned || unpinIfLast)) {

        AudioSystem::unregisterEffect(mId);

        sp<AudioFlinger> af = mAudioFlinger.promote();

        if (af != 0) {

            mLock.unlock();

            af->updateOrphanEffectChains(this);

            mLock.lock();

        }

    }

    return numHandles;

}



bool AudioFlinger::EffectModule::updateState() {

    Mutex::Autolock _l(mLock);
@@ -1260,6 +1278,13 @@ void AudioFlinger::EffectHandle::disconnect(bool unpinIfLast) 
    }

    if (thread != 0) {

        thread->disconnectEffectHandle(this, unpinIfLast);

    } else {

        ALOGW("%s Effect handle %p disconnected after thread destruction", __FUNCTION__, this);

        // try to cleanup as much as we can

        sp<EffectModule> effect = mEffect.promote();

        if (effect != 0) {

            effect->disconnectHandle(this, unpinIfLast);

        }

    }



    if (mClient != 0) {

services/audioflinger/Effects.h

+1 −0
Original line number Diff line number Diff line
@@ -95,6 +95,7 @@ public: 
    const wp<ThreadBase>& thread() { return mThread; }



    status_t addHandle(EffectHandle *handle);

    ssize_t  disconnectHandle(EffectHandle *handle, bool unpinIfLast);

    ssize_t removeHandle(EffectHandle *handle);

    ssize_t removeHandle_l(EffectHandle *handle);

services/audiopolicy/service/AudioPolicyInterfaceImpl.cpp

+4 −1
Original line number Diff line number Diff line
@@ -400,7 +400,6 @@ void AudioPolicyService::releaseInput(audio_io_handle_t input, 
    sp<AudioPolicyEffects>audioPolicyEffects;

    {

        Mutex::Autolock _l(mLock);

        mAudioPolicyManager->releaseInput(input, session);

        audioPolicyEffects = mAudioPolicyEffects;

    }

    if (audioPolicyEffects != 0) {
@@ -410,6 +409,10 @@ void AudioPolicyService::releaseInput(audio_io_handle_t input, 
            ALOGW("Failed to release effects on input %d", input);

        }

    }

    {

        Mutex::Autolock _l(mLock);

        mAudioPolicyManager->releaseInput(input, session);

    }

}



status_t AudioPolicyService::initStreamVolume(audio_stream_type_t stream,