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

Commit ff705d86 authored by Shunkai Yao's avatar Shunkai Yao
Browse files

Update Bundle AIDL equalizer implementation with uuid type name 

Bug: 255361653
Test: atest VtsHalAudioEffectTargetTest
atest VtsHalAudioEffectFactoryTargetTest
atest VtsHalEqualizerTargetTest

Change-Id: I878bee22bf20530ddb7756f848c84e6b01917e5b
parent b99b4cf2

media/libeffects/lvm/wrapper/Aidl/BundleTypes.h

+3 −3
Original line number Diff line number Diff line
@@ -71,9 +71,9 @@ static const Equalizer::Capability kEqCap = {.bandFrequencies = kEqBandFrequency 
                                             .presets = kEqPresets};



static const Descriptor kEqualizerDesc = {

        .common = {.id = {.type = EqualizerTypeUUID,

                          .uuid = EqualizerBundleImplUUID,

                          .proxy = std::nullopt},

        .common = {.id = {.type = kEqualizerTypeUUID,

                          .uuid = kEqualizerBundleImplUUID,

                          .proxy = kEqualizerProxyUUID},

                   .flags = {.type = Flags::Type::INSERT,

                             .insert = Flags::Insert::FIRST,

                             .volume = Flags::Volume::CTRL},

media/libeffects/lvm/wrapper/Aidl/EffectBundleAidl.cpp

+4 −4
Original line number Diff line number Diff line
@@ -30,14 +30,14 @@ 
#include <limits.h>



using aidl::android::hardware::audio::effect::EffectBundleAidl;

using aidl::android::hardware::audio::effect::EqualizerBundleImplUUID;

using aidl::android::hardware::audio::effect::kEqualizerBundleImplUUID;

using aidl::android::hardware::audio::effect::IEffect;

using aidl::android::hardware::audio::effect::State;

using aidl::android::media::audio::common::AudioUuid;



extern "C" binder_exception_t createEffect(const AudioUuid* uuid,

                                           std::shared_ptr<IEffect>* instanceSpp) {

    if (uuid == nullptr || *uuid != EqualizerBundleImplUUID) {

    if (uuid == nullptr || *uuid != kEqualizerBundleImplUUID) {

        LOG(ERROR) << __func__ << "uuid not supported";

        return EX_ILLEGAL_ARGUMENT;

    }
@@ -71,7 +71,7 @@ namespace aidl::android::hardware::audio::effect { 


EffectBundleAidl::EffectBundleAidl(const AudioUuid& uuid) {

    LOG(DEBUG) << __func__ << uuid.toString();

    if (uuid == EqualizerBundleImplUUID) {

    if (uuid == kEqualizerBundleImplUUID) {

        mType = lvm::BundleEffectType::EQUALIZER;

        mDescriptor = &lvm::kEqualizerDesc;

    } else {
@@ -81,7 +81,7 @@ EffectBundleAidl::EffectBundleAidl(const AudioUuid& uuid) { 
}



EffectBundleAidl::~EffectBundleAidl() {

    releaseContext();

    cleanUp();

    LOG(DEBUG) << __func__;

}