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

Commit f1f15a1e authored by Shunkai Yao's avatar Shunkai Yao Committed by Gerrit Code Review
Browse files

Merge "Audio AIDL : Add libeffects reverb implementation uuids"

parents 5df4e6c4 b83ec077

audio/aidl/default/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -164,6 +164,7 @@ cc_binary { 
        "libloudnessenhanceraidl",

        "libnssw",

        "libpresetreverbsw",

        "libreverbaidl",

        "libtinyxml2",

        "libvirtualizersw",

        "libvisualizeraidl",

audio/aidl/default/audio_effects_config.xml

+5 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ 
        <library name="nssw" path="libnssw.so"/>

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

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

        <library name="reverb" path="libreverbaidl.so"/>

        <library name="virtualizersw" path="libvirtualizersw.so"/>

        <library name="visualizer" path="libvisualizeraidl.so"/>

        <library name="volumesw" path="libvolumesw.so"/>
@@ -78,6 +79,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="reverb_env_aux" library="reverb" uuid="4a387fc0-8ab3-11df-8bad-0002a5d5c51b"/>

        <effect name="reverb_env_ins" library="reverb" uuid="c7a511a0-a3bb-11df-860e-0002a5d5c51b"/>

        <effect name="reverb_pre_aux" library="reverb" uuid="f29a1400-a3bb-11df-8ddc-0002a5d5c51b"/>

        <effect name="reverb_pre_ins" library="reverb" uuid="172cdf00-a3bc-11df-a72f-0002a5d5c51b"/>

        <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"/>

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

+24 −0
Original line number Diff line number Diff line
@@ -189,6 +189,18 @@ static const AudioUuid kEnvReverbSwImplUUID = {static_cast<int32_t>(0xfa819886), 
                                               0x11ed,

                                               0x9b6a,

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

// 4a387fc0-8ab3-11df-8bad-0002a5d5c51b

static const AudioUuid kAuxEnvReverbImplUUID = {static_cast<int32_t>(0x4a387fc0),

                                                0x8ab3,

                                                0x11df,

                                                0x8bad,

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

// c7a511a0-a3bb-11df-860e-0002a5d5c51b

static const AudioUuid kInsertEnvReverbImplUUID = {static_cast<int32_t>(0xc7a511a0),

                                                   0xa3bb,

                                                   0x11df,

                                                   0x860e,

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

// 58b4b260-8e06-11e0-aa8e-0002a5d5c51b

static const AudioUuid kNoiseSuppressionTypeUUID = {static_cast<int32_t>(0x58b4b260),

                                                    0x8e06,
@@ -213,6 +225,18 @@ static const AudioUuid kPresetReverbSwImplUUID = {static_cast<int32_t>(0xfa8199c 
                                                  0x11ed,

                                                  0x9b6a,

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

// f29a1400-a3bb-11df-8ddc-0002a5d5c51b

static const AudioUuid kAuxPresetReverbImplUUID = {static_cast<int32_t>(0xf29a1400),

                                                   0xa3bb,

                                                   0x11df,

                                                   0x8ddc,

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

// 172cdf00-a3bc-11df-a72f-0002a5d5c51b

static const AudioUuid kInsertPresetReverbImplUUID = {static_cast<int32_t>(0x172cdf00),

                                                      0xa3bc,

                                                      0x11df,

                                                      0xa72f,

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

// 37cc2c00-dddd-11db-8577-0002a5d5c51b

static const AudioUuid kVirtualizerTypeUUID = {static_cast<int32_t>(0x37cc2c00),

                                               0xdddd,