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

Commit be853cf8 authored by Atneya Nair's avatar Atneya Nair Committed by Harish Mahendrakar
Browse files

Update AudioEffect callers to new interface 

Test: Compiles
Bug: 199156212
Merged-In: I317e2cbccefdafd6029717f6db3b3238b4ad3559
Change-Id: I317e2cbccefdafd6029717f6db3b3238b4ad3559
parent f2f012b7

media/libaudioclient/tests/audioeffect_tests.cpp

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ bool isEffectExistsOnAudioSession(const effect_uuid_t* type, int priority, 
    attributionSource.pid = VALUE_OR_FATAL(legacy2aidl_pid_t_int32_t(getpid()));

    attributionSource.token = sp<BBinder>::make();

    sp<AudioEffect> effect = new AudioEffect(attributionSource);

    effect->set(type, nullptr, priority, nullptr, nullptr, sessionId);

    effect->set(type, nullptr /* uid */, priority, nullptr /* callback */, sessionId);

    return effect->initCheck() == ALREADY_EXISTS;

}

services/audiopolicy/service/AudioPolicyEffects.cpp

+6 −4
Original line number Diff line number Diff line
@@ -127,7 +127,8 @@ status_t AudioPolicyEffects::addInputEffects(audio_io_handle_t input, 
            attributionSource.packageName = "android";

            attributionSource.token = sp<BBinder>::make();

            sp<AudioEffect> fx = new AudioEffect(attributionSource);

            fx->set(NULL, &effect->mUuid, -1, 0, 0, audioSession, input);

            fx->set(nullptr /*type */, &effect->mUuid, -1 /* priority */, nullptr /* callback */,

                    audioSession, input);

            status_t status = fx->initCheck();

            if (status != NO_ERROR && status != ALREADY_EXISTS) {

                ALOGW("addInputEffects(): failed to create Fx %s on source %d",
@@ -279,7 +280,8 @@ status_t AudioPolicyEffects::addOutputSessionEffects(audio_io_handle_t output, 
            attributionSource.packageName = "android";

            attributionSource.token = sp<BBinder>::make();

            sp<AudioEffect> fx = new AudioEffect(attributionSource);

            fx->set(NULL, &effect->mUuid, 0, 0, 0, audioSession, output);

            fx->set(nullptr /* type */, &effect->mUuid, 0 /* priority */, nullptr /* callback */,

                    audioSession, output);

            status_t status = fx->initCheck();

            if (status != NO_ERROR && status != ALREADY_EXISTS) {

                ALOGE("addOutputSessionEffects(): failed to create Fx  %s on session %d",
@@ -984,8 +986,8 @@ void AudioPolicyEffects::initDefaultDeviceEffects() 
            attributionSource.packageName = "android";

            attributionSource.token = sp<BBinder>::make();

            sp<AudioEffect> fx = new AudioEffect(attributionSource);

            fx->set(EFFECT_UUID_NULL, &effectDesc->mUuid, 0, nullptr,

                    nullptr, AUDIO_SESSION_DEVICE, AUDIO_IO_HANDLE_NONE,

            fx->set(EFFECT_UUID_NULL, &effectDesc->mUuid, 0 /* priority */, nullptr /* callback */,

                    AUDIO_SESSION_DEVICE, AUDIO_IO_HANDLE_NONE,

                    AudioDeviceTypeAddr{deviceEffects->getDeviceType(),

                                        deviceEffects->getDeviceAddress()});

            status_t status = fx->initCheck();