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

Commit e5f3acf6 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 9432410 from df3959e2 to udc-release 

Change-Id: If7555dfb5b7ae00c3cc720ee8ddf2dd96a00e799
parents 0d9ff8c9 df3959e2

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