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

Commit 8c2682b7 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "audio: add new audio formats"

parents a8d2f989 f2b77b07

audio/5.0/config/api/current.txt

+4 −0
Original line number Diff line number Diff line
@@ -20,8 +20,10 @@ package audio.policy.configuration.V5_0 { 
    enum_constant public static final audio.policy.configuration.V5_0.AudioDevice AUDIO_DEVICE_IN_COMMUNICATION;

    enum_constant public static final audio.policy.configuration.V5_0.AudioDevice AUDIO_DEVICE_IN_DEFAULT;

    enum_constant public static final audio.policy.configuration.V5_0.AudioDevice AUDIO_DEVICE_IN_DGTL_DOCK_HEADSET;

    enum_constant public static final audio.policy.configuration.V5_0.AudioDevice AUDIO_DEVICE_IN_ECHO_REFERENCE;

    enum_constant public static final audio.policy.configuration.V5_0.AudioDevice AUDIO_DEVICE_IN_FM_TUNER;

    enum_constant public static final audio.policy.configuration.V5_0.AudioDevice AUDIO_DEVICE_IN_HDMI;

    enum_constant public static final audio.policy.configuration.V5_0.AudioDevice AUDIO_DEVICE_IN_HDMI_ARC;

    enum_constant public static final audio.policy.configuration.V5_0.AudioDevice AUDIO_DEVICE_IN_IP;

    enum_constant public static final audio.policy.configuration.V5_0.AudioDevice AUDIO_DEVICE_IN_LINE;

    enum_constant public static final audio.policy.configuration.V5_0.AudioDevice AUDIO_DEVICE_IN_LOOPBACK;
@@ -128,6 +130,8 @@ package audio.policy.configuration.V5_0 { 
    enum_constant public static final audio.policy.configuration.V5_0.AudioFormat AUDIO_FORMAT_HE_AAC_V2;

    enum_constant public static final audio.policy.configuration.V5_0.AudioFormat AUDIO_FORMAT_IEC61937;

    enum_constant public static final audio.policy.configuration.V5_0.AudioFormat AUDIO_FORMAT_LDAC;

    enum_constant public static final audio.policy.configuration.V5_0.AudioFormat AUDIO_FORMAT_LHDC;

    enum_constant public static final audio.policy.configuration.V5_0.AudioFormat AUDIO_FORMAT_LHDC_LL;

    enum_constant public static final audio.policy.configuration.V5_0.AudioFormat AUDIO_FORMAT_MAT_1_0;

    enum_constant public static final audio.policy.configuration.V5_0.AudioFormat AUDIO_FORMAT_MAT_2_0;

    enum_constant public static final audio.policy.configuration.V5_0.AudioFormat AUDIO_FORMAT_MAT_2_1;

audio/5.0/config/audio_policy_configuration.xsd

+4 −0
Original line number Diff line number Diff line
@@ -277,6 +277,8 @@ 
            <xs:enumeration value="AUDIO_DEVICE_IN_PROXY"/>

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

            <xs:enumeration value="AUDIO_DEVICE_IN_DEFAULT"/>

            <xs:enumeration value="AUDIO_DEVICE_IN_STUB"/>

        </xs:restriction>
@@ -370,6 +372,8 @@ 
            <xs:enumeration value="AUDIO_FORMAT_AAC_LATM_HE_V2"/>

            <xs:enumeration value="AUDIO_FORMAT_CELT"/>

            <xs:enumeration value="AUDIO_FORMAT_APTX_ADAPTIVE"/>

            <xs:enumeration value="AUDIO_FORMAT_LHDC"/>

            <xs:enumeration value="AUDIO_FORMAT_LHDC_LL"/>

        </xs:restriction>

    </xs:simpleType>

    <xs:simpleType name="extendableAudioFormat">

audio/common/5.0/types.hal

+2 −0
Original line number Diff line number Diff line
@@ -238,6 +238,8 @@ enum AudioFormat : uint32_t { 
    AAC_LATM            = 0x25000000UL,

    CELT                = 0x26000000UL,

    APTX_ADAPTIVE       = 0x27000000UL,

    LHDC                = 0x28000000UL,

    LHDC_LL             = 0x29000000UL,



    /** Deprecated */

    MAIN_MASK           = 0xFF000000UL,

audio/effect/2.0/xml/audio_effects_conf.xsd

+1 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ 
      <xs:enumeration value="voice_recognition"/>

      <xs:enumeration value="voice_communication"/>

      <xs:enumeration value="unprocessed"/>

      <xs:enumeration value="voice_performance"/>

    </xs:restriction>

  </xs:simpleType>

  <xs:simpleType name="streamOutputType">

audio/effect/5.0/xml/api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -74,6 +74,7 @@ package audio.effects.V5_0 { 
    enum_constant public static final audio.effects.V5_0.StreamInputType voice_call;

    enum_constant public static final audio.effects.V5_0.StreamInputType voice_communication;

    enum_constant public static final audio.effects.V5_0.StreamInputType voice_downlink;

    enum_constant public static final audio.effects.V5_0.StreamInputType voice_performance;

    enum_constant public static final audio.effects.V5_0.StreamInputType voice_recognition;

    enum_constant public static final audio.effects.V5_0.StreamInputType voice_uplink;

  }