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

Commit b76d8e27 authored by Andy Hung's avatar Andy Hung Committed by Gerrit Code Review
Browse files

Merge changes from topics "dra", "dts_uhd", "earc" 

* changes:
  Audio: Add AUDIO_FORMAT_DRA
  audio: Add device constants for HDMI EARC
  Audio: Add AUDIO_FORMAT_DTS_UHD
parents b5ee70f1 6ce19700

audio/7.0/config/api/current.txt

+4 −0
Original line number Diff line number Diff line
@@ -106,6 +106,7 @@ package android.audio.policy.configuration.V7_0 { 
    enum_constant public static final android.audio.policy.configuration.V7_0.AudioDevice AUDIO_DEVICE_IN_FM_TUNER;

    enum_constant public static final android.audio.policy.configuration.V7_0.AudioDevice AUDIO_DEVICE_IN_HDMI;

    enum_constant public static final android.audio.policy.configuration.V7_0.AudioDevice AUDIO_DEVICE_IN_HDMI_ARC;

    enum_constant public static final android.audio.policy.configuration.V7_0.AudioDevice AUDIO_DEVICE_IN_HDMI_EARC;

    enum_constant public static final android.audio.policy.configuration.V7_0.AudioDevice AUDIO_DEVICE_IN_IP;

    enum_constant public static final android.audio.policy.configuration.V7_0.AudioDevice AUDIO_DEVICE_IN_LINE;

    enum_constant public static final android.audio.policy.configuration.V7_0.AudioDevice AUDIO_DEVICE_IN_LOOPBACK;
@@ -140,6 +141,7 @@ package android.audio.policy.configuration.V7_0 { 
    enum_constant public static final android.audio.policy.configuration.V7_0.AudioDevice AUDIO_DEVICE_OUT_FM;

    enum_constant public static final android.audio.policy.configuration.V7_0.AudioDevice AUDIO_DEVICE_OUT_HDMI;

    enum_constant public static final android.audio.policy.configuration.V7_0.AudioDevice AUDIO_DEVICE_OUT_HDMI_ARC;

    enum_constant public static final android.audio.policy.configuration.V7_0.AudioDevice AUDIO_DEVICE_OUT_HDMI_EARC;

    enum_constant public static final android.audio.policy.configuration.V7_0.AudioDevice AUDIO_DEVICE_OUT_HEARING_AID;

    enum_constant public static final android.audio.policy.configuration.V7_0.AudioDevice AUDIO_DEVICE_OUT_IP;

    enum_constant public static final android.audio.policy.configuration.V7_0.AudioDevice AUDIO_DEVICE_OUT_LINE;
@@ -208,9 +210,11 @@ package android.audio.policy.configuration.V7_0 { 
    enum_constant public static final android.audio.policy.configuration.V7_0.AudioFormat AUDIO_FORMAT_CELT;

    enum_constant public static final android.audio.policy.configuration.V7_0.AudioFormat AUDIO_FORMAT_DEFAULT;

    enum_constant public static final android.audio.policy.configuration.V7_0.AudioFormat AUDIO_FORMAT_DOLBY_TRUEHD;

    enum_constant public static final android.audio.policy.configuration.V7_0.AudioFormat AUDIO_FORMAT_DRA;

    enum_constant public static final android.audio.policy.configuration.V7_0.AudioFormat AUDIO_FORMAT_DSD;

    enum_constant public static final android.audio.policy.configuration.V7_0.AudioFormat AUDIO_FORMAT_DTS;

    enum_constant public static final android.audio.policy.configuration.V7_0.AudioFormat AUDIO_FORMAT_DTS_HD;

    enum_constant public static final android.audio.policy.configuration.V7_0.AudioFormat AUDIO_FORMAT_DTS_UHD;

    enum_constant public static final android.audio.policy.configuration.V7_0.AudioFormat AUDIO_FORMAT_EVRC;

    enum_constant public static final android.audio.policy.configuration.V7_0.AudioFormat AUDIO_FORMAT_EVRCB;

    enum_constant public static final android.audio.policy.configuration.V7_0.AudioFormat AUDIO_FORMAT_EVRCNW;

audio/7.0/config/audio_policy_configuration.xsd

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

            <xs:enumeration value="AUDIO_DEVICE_OUT_BLUETOOTH_A2DP_SPEAKER"/>

            <xs:enumeration value="AUDIO_DEVICE_OUT_HDMI"/>

            <xs:enumeration value="AUDIO_DEVICE_OUT_HDMI_EARC"/>

            <xs:enumeration value="AUDIO_DEVICE_OUT_AUX_DIGITAL"/>

            <xs:enumeration value="AUDIO_DEVICE_OUT_ANLG_DOCK_HEADSET"/>

            <xs:enumeration value="AUDIO_DEVICE_OUT_DGTL_DOCK_HEADSET"/>
@@ -303,6 +304,7 @@ 
            <xs:enumeration value="AUDIO_DEVICE_IN_USB_HEADSET"/>

            <xs:enumeration value="AUDIO_DEVICE_IN_BLUETOOTH_BLE"/>

            <xs:enumeration value="AUDIO_DEVICE_IN_HDMI_ARC"/>

            <xs:enumeration value="AUDIO_DEVICE_IN_HDMI_EARC"/>

            <xs:enumeration value="AUDIO_DEVICE_IN_ECHO_REFERENCE"/>

            <xs:enumeration value="AUDIO_DEVICE_IN_BLE_HEADSET"/>

            <xs:enumeration value="AUDIO_DEVICE_IN_DEFAULT"/>
@@ -411,6 +413,8 @@ 
            <xs:enumeration value="AUDIO_FORMAT_MPEGH_LC_L3"/>

            <xs:enumeration value="AUDIO_FORMAT_MPEGH_LC_L4"/>

            <xs:enumeration value="AUDIO_FORMAT_IEC60958"/>

            <xs:enumeration value="AUDIO_FORMAT_DTS_UHD"/>

            <xs:enumeration value="AUDIO_FORMAT_DRA"/>

        </xs:restriction>

    </xs:simpleType>

    <xs:simpleType name="extendableAudioFormat">

audio/common/7.0/enums/include/android_audio_policy_configuration_V7_0-enums.h

+2 −0
Original line number Diff line number Diff line
@@ -157,6 +157,7 @@ static inline bool isOutputDevice(AudioDevice device) { 
        case AudioDevice::AUDIO_DEVICE_OUT_TELEPHONY_TX:

        case AudioDevice::AUDIO_DEVICE_OUT_LINE:

        case AudioDevice::AUDIO_DEVICE_OUT_HDMI_ARC:

        case AudioDevice::AUDIO_DEVICE_OUT_HDMI_EARC:

        case AudioDevice::AUDIO_DEVICE_OUT_SPDIF:

        case AudioDevice::AUDIO_DEVICE_OUT_FM:

        case AudioDevice::AUDIO_DEVICE_OUT_AUX_LINE:
@@ -199,6 +200,7 @@ static inline bool isOutputDevice(AudioDevice device) { 
        case AudioDevice::AUDIO_DEVICE_IN_USB_HEADSET:

        case AudioDevice::AUDIO_DEVICE_IN_BLUETOOTH_BLE:

        case AudioDevice::AUDIO_DEVICE_IN_HDMI_ARC:

        case AudioDevice::AUDIO_DEVICE_IN_HDMI_EARC:

        case AudioDevice::AUDIO_DEVICE_IN_ECHO_REFERENCE:

        case AudioDevice::AUDIO_DEVICE_IN_BLE_HEADSET:

        case AudioDevice::AUDIO_DEVICE_IN_DEFAULT: