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

Commit 2553bd82 authored by Eric Laurent's avatar Eric Laurent Committed by Android (Google) Code Review
Browse files

Merge "audio: add new enums for 7.1 HAL"

parents 7a1f5983 5b8529a1

audio/7.1/config/api/current.txt

+4 −0
Original line number Diff line number Diff line
@@ -62,6 +62,8 @@ package android.audio.policy.configuration.V7_1 { 
    enum_constant public static final android.audio.policy.configuration.V7_1.AudioChannelMask AUDIO_CHANNEL_OUT_7POINT1;

    enum_constant public static final android.audio.policy.configuration.V7_1.AudioChannelMask AUDIO_CHANNEL_OUT_7POINT1POINT2;

    enum_constant public static final android.audio.policy.configuration.V7_1.AudioChannelMask AUDIO_CHANNEL_OUT_7POINT1POINT4;

    enum_constant public static final android.audio.policy.configuration.V7_1.AudioChannelMask AUDIO_CHANNEL_OUT_9POINT1POINT4;

    enum_constant public static final android.audio.policy.configuration.V7_1.AudioChannelMask AUDIO_CHANNEL_OUT_9POINT1POINT6;

    enum_constant public static final android.audio.policy.configuration.V7_1.AudioChannelMask AUDIO_CHANNEL_OUT_HAPTIC_AB;

    enum_constant public static final android.audio.policy.configuration.V7_1.AudioChannelMask AUDIO_CHANNEL_OUT_MONO;

    enum_constant public static final android.audio.policy.configuration.V7_1.AudioChannelMask AUDIO_CHANNEL_OUT_MONO_HAPTIC_A;
@@ -125,6 +127,7 @@ package android.audio.policy.configuration.V7_1 { 
    enum_constant public static final android.audio.policy.configuration.V7_1.AudioDevice AUDIO_DEVICE_OUT_ANLG_DOCK_HEADSET;

    enum_constant public static final android.audio.policy.configuration.V7_1.AudioDevice AUDIO_DEVICE_OUT_AUX_DIGITAL;

    enum_constant public static final android.audio.policy.configuration.V7_1.AudioDevice AUDIO_DEVICE_OUT_AUX_LINE;

    enum_constant public static final android.audio.policy.configuration.V7_1.AudioDevice AUDIO_DEVICE_OUT_BLE_BROADCAST;

    enum_constant public static final android.audio.policy.configuration.V7_1.AudioDevice AUDIO_DEVICE_OUT_BLE_HEADSET;

    enum_constant public static final android.audio.policy.configuration.V7_1.AudioDevice AUDIO_DEVICE_OUT_BLE_SPEAKER;

    enum_constant public static final android.audio.policy.configuration.V7_1.AudioDevice AUDIO_DEVICE_OUT_BLUETOOTH_A2DP;
@@ -284,6 +287,7 @@ package android.audio.policy.configuration.V7_1 { 
    enum_constant public static final android.audio.policy.configuration.V7_1.AudioInOutFlag AUDIO_OUTPUT_FLAG_NON_BLOCKING;

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

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

    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_VOIP_RX;

audio/7.1/config/audio_policy_configuration.xsd

+4 −0
Original line number Diff line number Diff line
@@ -179,6 +179,7 @@ 
            <xs:enumeration value="AUDIO_OUTPUT_FLAG_VOIP_RX" />

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

            <xs:enumeration value="AUDIO_INPUT_FLAG_HW_HOTWORD" />

            <xs:enumeration value="AUDIO_INPUT_FLAG_RAW" />
@@ -277,6 +278,7 @@ 
            <xs:enumeration value="AUDIO_DEVICE_OUT_ECHO_CANCELLER"/>

            <xs:enumeration value="AUDIO_DEVICE_OUT_BLE_HEADSET"/>

            <xs:enumeration value="AUDIO_DEVICE_OUT_BLE_SPEAKER"/>

            <xs:enumeration value="AUDIO_DEVICE_OUT_BLE_BROADCAST"/>

            <xs:enumeration value="AUDIO_DEVICE_OUT_DEFAULT"/>

            <xs:enumeration value="AUDIO_DEVICE_OUT_STUB"/>
@@ -511,6 +513,8 @@ 
            <xs:enumeration value="AUDIO_CHANNEL_OUT_7POINT1"/>

            <xs:enumeration value="AUDIO_CHANNEL_OUT_7POINT1POINT2"/>

            <xs:enumeration value="AUDIO_CHANNEL_OUT_7POINT1POINT4"/>

            <xs:enumeration value="AUDIO_CHANNEL_OUT_9POINT1POINT4"/>

            <xs:enumeration value="AUDIO_CHANNEL_OUT_9POINT1POINT6"/>

            <xs:enumeration value="AUDIO_CHANNEL_OUT_13POINT_360RA"/>

            <xs:enumeration value="AUDIO_CHANNEL_OUT_22POINT2"/>

            <xs:enumeration value="AUDIO_CHANNEL_OUT_MONO_HAPTIC_A"/>

audio/common/7.1/enums/include/android_audio_policy_configuration_V7_1-enums.h

+3 −0
Original line number Diff line number Diff line
@@ -97,10 +97,12 @@ static inline size_t getChannelCount(AudioChannelMask mask) { 
        case AudioChannelMask::AUDIO_CHANNEL_OUT_13POINT_360RA:

        case AudioChannelMask::AUDIO_CHANNEL_INDEX_MASK_13:

            return 13;

        case AudioChannelMask::AUDIO_CHANNEL_OUT_9POINT1POINT4:

        case AudioChannelMask::AUDIO_CHANNEL_INDEX_MASK_14:

            return 14;

        case AudioChannelMask::AUDIO_CHANNEL_INDEX_MASK_15:

            return 15;

        case AudioChannelMask::AUDIO_CHANNEL_OUT_9POINT1POINT6:

        case AudioChannelMask::AUDIO_CHANNEL_INDEX_MASK_16:

            return 16;

        case AudioChannelMask::AUDIO_CHANNEL_INDEX_MASK_17:
@@ -170,6 +172,7 @@ static inline bool isOutputDevice(AudioDevice device) { 
        case AudioDevice::AUDIO_DEVICE_OUT_ECHO_CANCELLER:

        case AudioDevice::AUDIO_DEVICE_OUT_BLE_HEADSET:

        case AudioDevice::AUDIO_DEVICE_OUT_BLE_SPEAKER:

        case AudioDevice::AUDIO_DEVICE_OUT_BLE_BROADCAST:

        case AudioDevice::AUDIO_DEVICE_OUT_DEFAULT:

        case AudioDevice::AUDIO_DEVICE_OUT_STUB:

            return true;