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

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

Merge "Audio AIDL : Add libeffects bass boost bundle uuid" am: 2e9fe5d8 am: 780352fe 

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



Change-Id: I98453d5c040f2541f9b6914a5ab98c4ac6b392d3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d958b034 780352fe

audio/aidl/default/audio_effects_config.xml

+4 −1
Original line number Diff line number Diff line
@@ -61,7 +61,10 @@ 
    -->



    <effects>

        <effect name="bassboost" library="bassboostsw" uuid="fa8181f2-588b-11ed-9b6a-0242ac120002"/>

        <effectProxy name="bassboost" uuid="14804144-a5ee-4d24-aa88-0002a5d5c51b">

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

            <libsw library="bundle" uuid="8631f300-72e2-11df-b57e-0002a5d5c51b"/>

        </effectProxy>

        <effect name="dynamics_processing" library="dynamics_processingsw" uuid="fa818d78-588b-11ed-9b6a-0242ac120002"/>

        <effect name="haptic_generator" library="haptic_generatorsw" uuid="fa819110-588b-11ed-9b6a-0242ac120002"/>

        <effect name="loudness_enhancer" library="loudness_enhancersw" uuid="fa819610-588b-11ed-9b6a-0242ac120002"/>

audio/aidl/default/bassboost/BassBoostSw.cpp

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

        .common = {.id = {.type = kBassBoostTypeUUID,

                          .uuid = kBassBoostSwImplUUID,

                          .proxy = std::nullopt},

                          .proxy = kBassBoostProxyUUID},

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

                             .insert = Flags::Insert::FIRST,

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

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

+12 −0
Original line number Diff line number Diff line
@@ -45,6 +45,18 @@ static const AudioUuid kBassBoostSwImplUUID = {static_cast<int32_t>(0xfa8181f2), 
                                               0x11ed,

                                               0x9b6a,

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

// 8631f300-72e2-11df-b57e-0002a5d5c51b

static const AudioUuid kBassBoostBundleImplUUID = {static_cast<int32_t>(0x8631f300),

                                                   0x72e2,

                                                   0x11df,

                                                   0xb57e,

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

// 14804144-a5ee-4d24-aa88-0002a5d5c51b

static const AudioUuid kBassBoostProxyUUID = {static_cast<int32_t>(0x14804144),

                                              0xa5ee,

                                              0x4d24,

                                              0xaa88,

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

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

static const AudioUuid kDownmixTypeUUID = {static_cast<int32_t>(0xfa81862a),

                                           0x588b,