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

Commit 790a60b1 authored by Mikhail Naganov's avatar Mikhail Naganov Committed by Gerrit Code Review
Browse files

Merge "Audio AIDL : Add libeffects haptic generator implementation uuid"

parents 95aa48b4 ae7dde5d

audio/aidl/common/include/Utils.h

+5 −4
Original line number Diff line number Diff line
@@ -48,7 +48,8 @@ constexpr size_t getPcmSampleSizeInBytes(::aidl::android::media::audio::common:: 
}



constexpr size_t getChannelCount(

        const ::aidl::android::media::audio::common::AudioChannelLayout& layout) {

        const ::aidl::android::media::audio::common::AudioChannelLayout& layout,

        int32_t mask = std::numeric_limits<int32_t>::max()) {

    using Tag = ::aidl::android::media::audio::common::AudioChannelLayout::Tag;

    switch (layout.getTag()) {

        case Tag::none:
@@ -56,11 +57,11 @@ constexpr size_t getChannelCount( 
        case Tag::invalid:

            return 0;

        case Tag::indexMask:

            return __builtin_popcount(layout.get<Tag::indexMask>());

            return __builtin_popcount(layout.get<Tag::indexMask>() & mask);

        case Tag::layoutMask:

            return __builtin_popcount(layout.get<Tag::layoutMask>());

            return __builtin_popcount(layout.get<Tag::layoutMask>() & mask);

        case Tag::voiceMask:

            return __builtin_popcount(layout.get<Tag::voiceMask>());

            return __builtin_popcount(layout.get<Tag::voiceMask>() & mask);

    }

    return 0;

}

audio/aidl/default/Android.bp

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

        "libenvreverbsw",

        "libequalizersw",

        "libhapticgeneratorsw",

        "libhapticgeneratoraidl",

        "libloudnessenhanceraidl",

        "libpresetreverbsw",

        "libtinyxml2",

audio/aidl/default/audio_effects_config.xml

+2 −2
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ 
        <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"/>

        <library name="haptic_generator" path="libhapticgeneratoraidl.so"/>

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

        <library name="nssw" path="libnssw.so"/>

        <library name="env_reverbsw" path="libenvreverbsw.so"/>
@@ -73,7 +73,7 @@ 
        </effectProxy>

        <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="haptic_generator" library="haptic_generator" uuid="97c4acd1-8b82-4f2f-832e-c2fe5d7a9931"/>

        <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="noise_suppression" library="nssw" uuid="c06c8400-8e06-11e0-9cb6-0002a5d5c51b"/>

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

+6 −0
Original line number Diff line number Diff line
@@ -147,6 +147,12 @@ static const AudioUuid kHapticGeneratorSwImplUUID = {static_cast<int32_t>(0xfa81 
                                                     0x11ed,

                                                     0x9b6a,

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

// 97c4acd1-8b82-4f2f-832e-c2fe5d7a9931

static const AudioUuid kHapticGeneratorImplUUID = {static_cast<int32_t>(0x97c4acd1),

                                                   0x8b82,

                                                   0x4f2f,

                                                   0x832e,

                                                   {0xc2, 0xfe, 0x5d, 0x7a, 0x99, 0x31}};

// fe3199be-aed0-413f-87bb-11260eb63cf1

static const AudioUuid kLoudnessEnhancerTypeUUID = {static_cast<int32_t>(0xfe3199be),

                                                    0xaed0,