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

Commit 1e8b118a authored by Glenn Kasten's avatar Glenn Kasten Committed by Android (Google) Code Review
Browse files

Merge "AudioPolicyService InputDesc minor cleanup"

parents a64890a0 fcf2ac04

services/audioflinger/AudioPolicyService.cpp

+3 −5
Original line number Diff line number Diff line
@@ -298,8 +298,7 @@ audio_io_handle_t AudioPolicyService::getInput(audio_source_t inputSource, 
    ssize_t idx = mInputs.indexOfKey(input);

    InputDesc *inputDesc;

    if (idx < 0) {

        inputDesc = new InputDesc();

        inputDesc->mSessionId = audioSession;

        inputDesc = new InputDesc(audioSession);

        mInputs.add(input, inputDesc);

    } else {

        inputDesc = mInputs.valueAt(idx);
@@ -358,7 +357,6 @@ void AudioPolicyService::releaseInput(audio_io_handle_t input) 
    }

    InputDesc *inputDesc = mInputs.valueAt(index);

    setPreProcessorEnabled(inputDesc, false);

    inputDesc->mEffects.clear();

    delete inputDesc;

    mInputs.removeItemsAt(index);

}
@@ -602,9 +600,9 @@ status_t AudioPolicyService::dumpPermissionDenial(int fd) 
    return NO_ERROR;

}



void AudioPolicyService::setPreProcessorEnabled(InputDesc *inputDesc, bool enabled)

void AudioPolicyService::setPreProcessorEnabled(const InputDesc *inputDesc, bool enabled)

{

    Vector<sp<AudioEffect> > fxVector = inputDesc->mEffects;

    const Vector<sp<AudioEffect> > &fxVector = inputDesc->mEffects;

    for (size_t i = 0; i < fxVector.size(); i++) {

        fxVector.itemAt(i)->setEnabled(enabled);

    }

services/audioflinger/AudioPolicyService.h

+4 −4
Original line number Diff line number Diff line
@@ -279,15 +279,15 @@ private: 


    class InputDesc {

    public:

        InputDesc() {}

        virtual ~InputDesc() {}

        int mSessionId;

        InputDesc(int session) : mSessionId(session) {}

        /*virtual*/ ~InputDesc() {}

        const int mSessionId;

        Vector< sp<AudioEffect> >mEffects;

    };



    static const char * const kInputSourceNames[AUDIO_SOURCE_CNT -1];



    void setPreProcessorEnabled(InputDesc *inputDesc, bool enabled);

    void setPreProcessorEnabled(const InputDesc *inputDesc, bool enabled);

    status_t loadPreProcessorConfig(const char *path);

    status_t loadEffects(cnode *root, Vector <EffectDesc *>& effects);

    EffectDesc *loadEffect(cnode *root);