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

Commit c0d69812 authored by Eric Laurent's avatar Eric Laurent Committed by Automerger Merge Worker
Browse files

Merge "use sp<AudioEffect> instead of unique_ptr<AudioEffect>" am: 2b8b3f8f am: 5d198632 

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1622460

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idce15cba5bdd23f3a9ddcd2d2c265015ec1a7b30
parents 92a10e0e 5d198632

services/audiopolicy/service/AudioPolicyEffects.cpp

+2 −2
Original line number Diff line number Diff line
@@ -970,7 +970,7 @@ void AudioPolicyEffects::initDefaultDeviceEffects() 
    for (const auto& deviceEffectsIter : mDeviceEffects) {

        const auto& deviceEffects =  deviceEffectsIter.second;

        for (const auto& effectDesc : deviceEffects->mEffectDescriptors->mEffects) {

            auto fx = std::make_unique<AudioEffect>(String16("android"));

            sp<AudioEffect> fx = new AudioEffect(String16("android"));

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

                    nullptr, AUDIO_SESSION_DEVICE, AUDIO_IO_HANDLE_NONE,

                    AudioDeviceTypeAddr{deviceEffects->getDeviceType(),
@@ -987,7 +987,7 @@ void AudioPolicyEffects::initDefaultDeviceEffects() 
            ALOGV("%s(): create Fx %s added on port type=%d address=%s", __func__,

                  effectDesc->mName, deviceEffects->getDeviceType(),

                  deviceEffects->getDeviceAddress().c_str());

            deviceEffects->mEffects.push_back(std::move(fx));

            deviceEffects->mEffects.push_back(fx);

        }

    }

}

services/audiopolicy/service/AudioPolicyEffects.h

+1 −1
Original line number Diff line number Diff line
@@ -207,7 +207,7 @@ private: 
            mDeviceType(device), mDeviceAddress(address) {}

        /*virtual*/ ~DeviceEffects() = default;



        std::vector<std::unique_ptr<AudioEffect>> mEffects;

        std::vector< sp<AudioEffect> > mEffects;

        audio_devices_t getDeviceType() const { return mDeviceType; }

        std::string getDeviceAddress() const { return mDeviceAddress; }

        const std::unique_ptr<EffectDescVector> mEffectDescriptors;