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

Commit 0c9ce88b authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "audioflinger: refactor EffectModule class" am: 186f9ccf am: c69cab48 

Change-Id: Id00e808bd10fbc20def244c8aad4443fc5b95276
parents b90b4d89 c69cab48

services/audioflinger/AudioFlinger.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -3507,7 +3507,7 @@ sp<IEffect> AudioFlinger::createEffect( 




    if (lStatus == NO_ERROR || lStatus == ALREADY_EXISTS) {

    if (lStatus == NO_ERROR || lStatus == ALREADY_EXISTS) {

        // Check CPU and memory usage

        // Check CPU and memory usage

        sp<EffectModule> effect = handle->effect().promote();

        sp<EffectBase> effect = handle->effect().promote();

        if (effect != nullptr) {

        if (effect != nullptr) {

            status_t rStatus = effect->updatePolicyState();

            status_t rStatus = effect->updatePolicyState();

            if (rStatus != NO_ERROR) {

            if (rStatus != NO_ERROR) {

services/audioflinger/AudioFlinger.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -533,6 +533,7 @@ private: 
    class AsyncCallbackThread;

    class AsyncCallbackThread;

    class Track;

    class Track;

    class RecordTrack;

    class RecordTrack;

    class EffectBase;

    class EffectModule;

    class EffectModule;

    class EffectHandle;

    class EffectHandle;

    class EffectChain;

    class EffectChain;