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

Commit 7ed70a80 authored by Mikhail Naganov's avatar Mikhail Naganov Committed by Gerrit Code Review
Browse files

Merge changes from topic "upstream-hal-v7_1-p4" 

* changes:
  audio VTS: Fix HAL device management
  Make AUDIO_USAGE_NOTIFICATION_EVENT available to HALs
  audio: Add android.hardware.audio[.common]@7.1-util modules
  audio: add Ultrasound materials to 7.1
parents 13eaedca e6214078

audio/7.1/config/api/current.txt

+5 −0
Original line number Diff line number Diff line
@@ -86,6 +86,7 @@ package android.audio.policy.configuration.V7_1 { 
    enum_constant public static final android.audio.policy.configuration.V7_1.AudioContentType AUDIO_CONTENT_TYPE_MUSIC;

    enum_constant public static final android.audio.policy.configuration.V7_1.AudioContentType AUDIO_CONTENT_TYPE_SONIFICATION;

    enum_constant public static final android.audio.policy.configuration.V7_1.AudioContentType AUDIO_CONTENT_TYPE_SPEECH;

    enum_constant public static final android.audio.policy.configuration.V7_1.AudioContentType AUDIO_CONTENT_TYPE_ULTRASOUND;

    enum_constant public static final android.audio.policy.configuration.V7_1.AudioContentType AUDIO_CONTENT_TYPE_UNKNOWN;

  }
@@ -273,6 +274,7 @@ package android.audio.policy.configuration.V7_1 { 
    enum_constant public static final android.audio.policy.configuration.V7_1.AudioInOutFlag AUDIO_INPUT_FLAG_MMAP_NOIRQ;

    enum_constant public static final android.audio.policy.configuration.V7_1.AudioInOutFlag AUDIO_INPUT_FLAG_RAW;

    enum_constant public static final android.audio.policy.configuration.V7_1.AudioInOutFlag AUDIO_INPUT_FLAG_SYNC;

    enum_constant public static final android.audio.policy.configuration.V7_1.AudioInOutFlag AUDIO_INPUT_FLAG_ULTRASOUND;

    enum_constant public static final android.audio.policy.configuration.V7_1.AudioInOutFlag AUDIO_INPUT_FLAG_VOIP_TX;

    enum_constant public static final android.audio.policy.configuration.V7_1.AudioInOutFlag AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD;

    enum_constant public static final android.audio.policy.configuration.V7_1.AudioInOutFlag AUDIO_OUTPUT_FLAG_DEEP_BUFFER;
@@ -290,6 +292,7 @@ package android.audio.policy.configuration.V7_1 { 
    enum_constant public static final android.audio.policy.configuration.V7_1.AudioInOutFlag AUDIO_OUTPUT_FLAG_SPATIALIZER;

    enum_constant public static final android.audio.policy.configuration.V7_1.AudioInOutFlag AUDIO_OUTPUT_FLAG_SYNC;

    enum_constant public static final android.audio.policy.configuration.V7_1.AudioInOutFlag AUDIO_OUTPUT_FLAG_TTS;

    enum_constant public static final android.audio.policy.configuration.V7_1.AudioInOutFlag AUDIO_OUTPUT_FLAG_ULTRASOUND;

    enum_constant public static final android.audio.policy.configuration.V7_1.AudioInOutFlag AUDIO_OUTPUT_FLAG_VOIP_RX;

  }
@@ -314,6 +317,7 @@ package android.audio.policy.configuration.V7_1 { 
    enum_constant public static final android.audio.policy.configuration.V7_1.AudioSource AUDIO_SOURCE_HOTWORD;

    enum_constant public static final android.audio.policy.configuration.V7_1.AudioSource AUDIO_SOURCE_MIC;

    enum_constant public static final android.audio.policy.configuration.V7_1.AudioSource AUDIO_SOURCE_REMOTE_SUBMIX;

    enum_constant public static final android.audio.policy.configuration.V7_1.AudioSource AUDIO_SOURCE_ULTRASOUND;

    enum_constant public static final android.audio.policy.configuration.V7_1.AudioSource AUDIO_SOURCE_UNPROCESSED;

    enum_constant public static final android.audio.policy.configuration.V7_1.AudioSource AUDIO_SOURCE_VOICE_CALL;

    enum_constant public static final android.audio.policy.configuration.V7_1.AudioSource AUDIO_SOURCE_VOICE_COMMUNICATION;
@@ -355,6 +359,7 @@ package android.audio.policy.configuration.V7_1 { 
    enum_constant public static final android.audio.policy.configuration.V7_1.AudioUsage AUDIO_USAGE_GAME;

    enum_constant public static final android.audio.policy.configuration.V7_1.AudioUsage AUDIO_USAGE_MEDIA;

    enum_constant public static final android.audio.policy.configuration.V7_1.AudioUsage AUDIO_USAGE_NOTIFICATION;

    enum_constant public static final android.audio.policy.configuration.V7_1.AudioUsage AUDIO_USAGE_NOTIFICATION_EVENT;

    enum_constant public static final android.audio.policy.configuration.V7_1.AudioUsage AUDIO_USAGE_NOTIFICATION_TELEPHONY_RINGTONE;

    enum_constant public static final android.audio.policy.configuration.V7_1.AudioUsage AUDIO_USAGE_SAFETY;

    enum_constant public static final android.audio.policy.configuration.V7_1.AudioUsage AUDIO_USAGE_UNKNOWN;

audio/7.1/config/audio_policy_configuration.xsd

+5 −0
Original line number Diff line number Diff line
@@ -180,6 +180,7 @@ 
            <xs:enumeration value="AUDIO_OUTPUT_FLAG_INCALL_MUSIC" />

            <xs:enumeration value="AUDIO_OUTPUT_FLAG_GAPLESS_OFFLOAD" />

            <xs:enumeration value="AUDIO_OUTPUT_FLAG_SPATIALIZER" />

            <xs:enumeration value="AUDIO_OUTPUT_FLAG_ULTRASOUND" />

            <xs:enumeration value="AUDIO_INPUT_FLAG_FAST" />

            <xs:enumeration value="AUDIO_INPUT_FLAG_HW_HOTWORD" />

            <xs:enumeration value="AUDIO_INPUT_FLAG_RAW" />
@@ -188,6 +189,7 @@ 
            <xs:enumeration value="AUDIO_INPUT_FLAG_VOIP_TX" />

            <xs:enumeration value="AUDIO_INPUT_FLAG_HW_AV_SYNC" />

            <xs:enumeration value="AUDIO_INPUT_FLAG_DIRECT" />

            <xs:enumeration value="AUDIO_INPUT_FLAG_ULTRASOUND" />

        </xs:restriction>

    </xs:simpleType>

    <xs:simpleType name="audioInOutFlags">
@@ -441,6 +443,7 @@ 
            <xs:enumeration value="AUDIO_USAGE_ALARM" />

            <xs:enumeration value="AUDIO_USAGE_NOTIFICATION" />

            <xs:enumeration value="AUDIO_USAGE_NOTIFICATION_TELEPHONY_RINGTONE" />

            <xs:enumeration value="AUDIO_USAGE_NOTIFICATION_EVENT" />

            <xs:enumeration value="AUDIO_USAGE_ASSISTANCE_ACCESSIBILITY" />

            <xs:enumeration value="AUDIO_USAGE_ASSISTANCE_NAVIGATION_GUIDANCE" />

            <xs:enumeration value="AUDIO_USAGE_ASSISTANCE_SONIFICATION" />
@@ -471,6 +474,7 @@ 
            <xs:enumeration value="AUDIO_CONTENT_TYPE_MUSIC"/>

            <xs:enumeration value="AUDIO_CONTENT_TYPE_MOVIE"/>

            <xs:enumeration value="AUDIO_CONTENT_TYPE_SONIFICATION"/>

            <xs:enumeration value="AUDIO_CONTENT_TYPE_ULTRASOUND"/>

        </xs:restriction>

    </xs:simpleType>

    <xs:simpleType name="samplingRates">
@@ -742,6 +746,7 @@ 
            <xs:enumeration value="AUDIO_SOURCE_ECHO_REFERENCE"/>

            <xs:enumeration value="AUDIO_SOURCE_FM_TUNER"/>

            <xs:enumeration value="AUDIO_SOURCE_HOTWORD"/>

            <xs:enumeration value="AUDIO_SOURCE_ULTRASOUND"/>

        </xs:restriction>

    </xs:simpleType>

    <!-- Enum values of device_category from Volume.h. -->

audio/common/all-versions/default/7.0/HidlUtils.cpp

+4 −0
Original line number Diff line number Diff line
@@ -485,8 +485,12 @@ status_t HidlUtils::audioGainToHal(const AudioGain& gain, struct audio_gain* hal 
status_t HidlUtils::audioUsageFromHal(audio_usage_t halUsage, AudioUsage* usage) {

    if (halUsage == AUDIO_USAGE_NOTIFICATION_COMMUNICATION_REQUEST ||

        halUsage == AUDIO_USAGE_NOTIFICATION_COMMUNICATION_INSTANT ||

#if MAJOR_VERSION == 7 && MINOR_VERSION == 1

        halUsage == AUDIO_USAGE_NOTIFICATION_COMMUNICATION_DELAYED) {

#else

        halUsage == AUDIO_USAGE_NOTIFICATION_COMMUNICATION_DELAYED ||

        halUsage == AUDIO_USAGE_NOTIFICATION_EVENT) {

#endif

        halUsage = AUDIO_USAGE_NOTIFICATION;

    }

    *usage = audio_usage_to_string(halUsage);

audio/common/all-versions/default/Android.bp

+54 −0
Original line number Diff line number Diff line
@@ -157,6 +157,28 @@ cc_library { 
    ],

}



cc_library {

    name: "android.hardware.audio.common@7.1-util",

    defaults: ["android.hardware.audio.common-util_default"],

    srcs: [

        "7.0/HidlUtils.cpp",

        "HidlUtilsCommon.cpp",

        "UuidUtils.cpp",

    ],

    shared_libs: [

        "android.hardware.audio.common@7.0",

        "android.hardware.audio.common@7.1-enums",

        "libbase",

    ],

    cflags: [

        "-DMAJOR_VERSION=7",

        "-DMINOR_VERSION=1",

        "-DCOMMON_TYPES_MINOR_VERSION=0",

        "-DCORE_TYPES_MINOR_VERSION=0",

        "-include common/all-versions/VersionMacro.h",

    ],

}



// Note: this isn't a VTS test, but rather a unit test

// to verify correctness of conversion utilities.

cc_test {
@@ -214,3 +236,35 @@ cc_test { 


    test_suites: ["device-tests"],

}



cc_test {

    name: "android.hardware.audio.common@7.1-util_tests",

    defaults: ["android.hardware.audio.common-util_default"],



    srcs: ["tests/hidlutils_tests.cpp"],



    // Use static linking to allow running in presubmit on

    // targets that don't have HAL V7.1.

    static_libs: [

        "android.hardware.audio.common@7.1-enums",

        "android.hardware.audio.common@7.1-util",

        "android.hardware.audio.common@7.0",

    ],



    shared_libs: [

        "libbase",

        "libxml2",

    ],



    cflags: [

        "-Werror",

        "-Wall",

        "-DMAJOR_VERSION=7",

        "-DMINOR_VERSION=1",

        "-DCOMMON_TYPES_MINOR_VERSION=0",

        "-DCORE_TYPES_MINOR_VERSION=0",

        "-include common/all-versions/VersionMacro.h",

    ],



    test_suites: ["device-tests"],

}

audio/common/all-versions/default/HidlUtilsCommon.cpp

+2 −2
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ namespace android { 
namespace hardware {

namespace audio {

namespace common {

namespace CPP_VERSION {

namespace COMMON_TYPES_CPP_VERSION {

namespace implementation {



status_t HidlUtils::audioPortConfigsFromHal(unsigned int numHalConfigs,
@@ -51,7 +51,7 @@ status_t HidlUtils::audioPortConfigsToHal(const hidl_vec<AudioPortConfig>& confi 
}



}  // namespace implementation

}  // namespace CPP_VERSION

}  // namespace COMMON_TYPES_CPP_VERSION

}  // namespace common

}  // namespace audio

}  // namespace hardware