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

Commit 8ce30754 authored by Shunkai Yao's avatar Shunkai Yao Committed by Automerger Merge Worker
Browse files

Merge "Audio AIDL : Add libeffects loudness enhancer implementation uuid" am:... 

Merge "Audio AIDL : Add libeffects loudness enhancer implementation uuid" am: 2af598bf am: 96c7fe17

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



Change-Id: Ib6d59bb04f3a29949d7fa2f519dcab5887681765
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 24dea601 96c7fe17

audio/aidl/default/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -155,7 +155,7 @@ cc_binary { 
        "libenvreverbsw",

        "libequalizersw",

        "libhapticgeneratorsw",

        "libloudnessenhancersw",

        "libloudnessenhanceraidl",

        "libpresetreverbsw",

        "libtinyxml2",

        "libvirtualizersw",

audio/aidl/default/audio_effects_config.xml

+2 −2
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ 
        <library name="dynamics_processingsw" path="libdynamicsprocessingsw.so"/>

        <library name="equalizersw" path="libequalizersw.so"/>

        <library name="haptic_generatorsw" path="libhapticgeneratorsw.so"/>

        <library name="loudness_enhancersw" path="libloudnessenhancersw.so"/>

        <library name="loudness_enhancer" path="libloudnessenhanceraidl.so"/>

        <library name="env_reverbsw" path="libenvreverbsw.so"/>

        <library name="preset_reverbsw" path="libpresetreverbsw.so"/>

        <library name="virtualizersw" path="libvirtualizersw.so"/>
@@ -67,7 +67,7 @@ 
        </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"/>

        <effect name="loudness_enhancer" library="loudness_enhancer" uuid="fa415329-2034-4bea-b5dc-5b381c8d1e2c"/>

        <effect name="env_reverb" library="env_reverbsw" uuid="fa819886-588b-11ed-9b6a-0242ac120002"/>

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

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

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

+6 −0
Original line number Diff line number Diff line
@@ -129,6 +129,12 @@ static const AudioUuid kLoudnessEnhancerSwImplUUID = {static_cast<int32_t>(0xfa8 
                                                      0x11ed,

                                                      0x9b6a,

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

// fa415329-2034-4bea-b5dc-5b381c8d1e2c

static const AudioUuid kLoudnessEnhancerImplUUID = {static_cast<int32_t>(0xfa415329),

                                                    0x2034,

                                                    0x4bea,

                                                    0xb5dc,

                                                    {0x5b, 0x38, 0x1c, 0x8d, 0x1e, 0x2c}};

// c2e5d5f0-94bd-4763-9cac-4e234d06839e

static const AudioUuid kEnvReverbTypeUUID = {static_cast<int32_t>(0xc2e5d5f0),

                                             0x94bd,