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

Commit b5087157 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge changes from topic "aidl_audio_effect_virtualizer_impl" am: 686c214a... 

Merge changes from topic "aidl_audio_effect_virtualizer_impl" am: 686c214a am: 356795a1 am: dadb91d2

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2361673



Change-Id: I6cafd6d6512b10a43622ce5a9a7a99782386a2b8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4fec7ac0 dadb91d2

audio/aidl/default/audio_effects_config.xml

+4 −1
Original line number Diff line number Diff line
@@ -78,7 +78,10 @@ 
        <effect name="env_reverb" library="env_reverbsw" uuid="fa819886-588b-11ed-9b6a-0242ac120002"/>

        <effect name="noise_suppression" library="nssw" uuid="c06c8400-8e06-11e0-9cb6-0002a5d5c51b"/>

        <effect name="preset_reverb" library="preset_reverbsw" uuid="fa8199c6-588b-11ed-9b6a-0242ac120002"/>

        <effect name="virtualizer" library="virtualizersw" uuid="fa819d86-588b-11ed-9b6a-0242ac120002"/>

        <effectProxy name="virtualizer" uuid="d3467faa-acc7-4d34-acaf-0002a5d5c51b">

            <libsw library="virtualizersw" uuid="fa819d86-588b-11ed-9b6a-0242ac120002"/>

            <libsw library="bundle" uuid="1d4033c0-8557-11df-9f2d-0002a5d5c51b"/>

        </effectProxy>

        <effect name="visualizer" library="visualizersw" uuid="fa81a0f6-588b-11ed-9b6a-0242ac120002"/>

        <effect name="volume" library="volumesw" uuid="fa81a718-588b-11ed-9b6a-0242ac120002"/>

        <effectProxy name="equalizer" uuid="c8e70ecd-48ca-456e-8a4f-0002a5d5c51b">

audio/aidl/default/include/effect-impl/EffectUUID.h

+12 −0
Original line number Diff line number Diff line
@@ -213,6 +213,18 @@ static const AudioUuid kVirtualizerSwImplUUID = {static_cast<int32_t>(0xfa819d86 
                                                 0x11ed,

                                                 0x9b6a,

                                                 {0x02, 0x42, 0xac, 0x12, 0x00, 0x02}};

// 1d4033c0-8557-11df-9f2d-0002a5d5c51b

static const AudioUuid kVirtualizerBundleImplUUID = {static_cast<int32_t>(0x1d4033c0),

                                                     0x8557,

                                                     0x11df,

                                                     0x9f2d,

                                                     {0x00, 0x02, 0xa5, 0xd5, 0xc5, 0x1b}};

// d3467faa-acc7-4d34-acaf-0002a5d5c51b

static const AudioUuid kVirtualizerProxyUUID = {static_cast<int32_t>(0xd3467faa),

                                                0xacc7,

                                                0x4d34,

                                                0xacaf,

                                                {0x00, 0x02, 0xa5, 0xd5, 0xc5, 0x1b}};

// fa819f3e-588b-11ed-9b6a-0242ac120002

static const AudioUuid kVisualizerTypeUUID = {static_cast<int32_t>(0xfa819f3e),

                                              0x588b,

audio/aidl/default/virtualizer/VirtualizerSw.cpp

+1 −1
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ const Virtualizer::Capability VirtualizerSw::kCapability = {.strengthSupported = 
const Descriptor VirtualizerSw::kDescriptor = {

        .common = {.id = {.type = kVirtualizerTypeUUID,

                          .uuid = kVirtualizerSwImplUUID,

                          .proxy = std::nullopt},

                          .proxy = kVirtualizerProxyUUID},

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

                             .insert = Flags::Insert::FIRST,

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