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

Commit b02f80b5 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Audio AIDL : Add libeffects downmix implementation uuid"

parents 6109a9c6 4ff8698a

audio/aidl/default/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -151,7 +151,7 @@ cc_binary { 
    shared_libs: [

        "libbassboostsw",

        "libbundleaidl",

        "libdownmixsw",

        "libdownmixaidl",

        "libdynamicsprocessingsw",

        "libenvreverbsw",

        "libequalizersw",

audio/aidl/default/audio_effects_config.xml

+2 −2
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ 
    <libraries>

        <library name="bassboostsw" path="libbassboostsw.so"/>

        <library name="bundle" path="libbundleaidl.so"/>

        <library name="downmixsw" path="libdownmixsw.so"/>

        <library name="downmix" path="libdownmixaidl.so"/>

        <library name="dynamics_processingsw" path="libdynamicsprocessingsw.so"/>

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

        <library name="haptic_generatorsw" path="libhapticgeneratorsw.so"/>
@@ -66,7 +66,7 @@ 
            <libsw library="bassboostsw" uuid="fa8181f2-588b-11ed-9b6a-0242ac120002"/>

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

        </effectProxy>

        <effect name="downmix" library="downmixsw" uuid="fa8187ba-588b-11ed-9b6a-0242ac120002"/>

        <effect name="downmix" library="downmix" uuid="93f04452-e4fe-41cc-91f9-e475b6d1d69f"/>

        <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_enhancer" uuid="fa415329-2034-4bea-b5dc-5b381c8d1e2c"/>

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

+6 −0
Original line number Diff line number Diff line
@@ -69,6 +69,12 @@ static const AudioUuid kDownmixSwImplUUID = {static_cast<int32_t>(0xfa8187ba), 
                                             0x11ed,

                                             0x9b6a,

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

// 93f04452-e4fe-41cc-91f9-e475b6d1d69f

static const AudioUuid kDownmixImplUUID = {static_cast<int32_t>(0x93f04452),

                                           0xe4fe,

                                           0x41cc,

                                           0x91f9,

                                           {0xe4, 0x75, 0xb6, 0xd1, 0xd6, 0x9f}};

// 0bed4300-ddd6-11db-8f34-0002a5d5c51b.

static const AudioUuid kEqualizerTypeUUID = {static_cast<int32_t>(0x0bed4300),

                                             0xddd6,