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

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

Merge changes from topic "aidl_audio_effect_volume_impl" am: 18c9dd8a am: 0d35758b 

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



Change-Id: Ib8ec843c572567be2db5fa2c939118fede1ef119
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ec361e67 0d35758b

audio/aidl/TEST_MAPPING

+3 −0
Original line number Diff line number Diff line
@@ -27,6 +27,9 @@ 
    {

      "name": "VtsHalVisualizerTargetTest"

    },

    {

      "name": "VtsHalVolumeTargetTest"

    },

    {

      "name": "VtsHalAECTargetTest"

    },

audio/aidl/aidl_api/android.hardware.audio.effect/current/android/hardware/audio/effect/Volume.aidl

+3 −0
Original line number Diff line number Diff line
@@ -37,6 +37,9 @@ union Volume { 
  android.hardware.audio.effect.VendorExtension vendor;

  int levelDb;

  boolean mute;

  // TODO(b/263416041) Move to Capability

  const int MIN_LEVEL_DB = -9600;

  const int MAX_LEVEL_DB = 0;

  @VintfStability

  union Id {

    int vendorExtensionTag;

audio/aidl/android/hardware/audio/effect/Volume.aidl

+12 −0
Original line number Diff line number Diff line
@@ -57,6 +57,18 @@ union Volume { 
        int maxLevel;

    }



    // TODO(b/263416041) Move to Capability

    /**

     * Minimal level in dB.

     */

    const int MIN_LEVEL_DB = -9600;



    /**

     * Maximum level in dB.

     */

    const int MAX_LEVEL_DB = 0;



    /**

    /**

     * Current level in dB.

     */

audio/aidl/default/audio_effects_config.xml

+1 −1
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ 
            <libsw library="bundle" uuid="1d4033c0-8557-11df-9f2d-0002a5d5c51b"/>

        </effectProxy>

        <effect name="visualizer" library="visualizersw" uuid="fa81a0f6-588b-11ed-9b6a-0242ac120002"/>

        <effect name="volume" library="volumesw" uuid="fa81a718-588b-11ed-9b6a-0242ac120002"/>

        <effect name="volume" library="bundle" uuid="119341a0-8469-11df-81f9-0002a5d5c51b"/>

        <effectProxy name="equalizer" uuid="c8e70ecd-48ca-456e-8a4f-0002a5d5c51b">

            <libsw library="equalizersw" uuid="0bed4300-847d-11df-bb17-0002a5d5c51b"/>

            <libsw library="bundle" uuid="ce772f20-847d-11df-bb17-0002a5d5c51b"/>

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

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

                                            0x9b6a,

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

// 119341a0-8469-11df-81f9-0002a5d5c51b

static const AudioUuid kVolumeBundleImplUUID = {static_cast<int32_t>(0x119341a0),

                                                0x8469,

                                                0x11df,

                                                0x81f9,

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



/**

 * @brief A map between effect name and effect type UUID.