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

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

Merge "audio: add new audio formats"

parents f96dc6ed 1f702cac

audio/5.0/config/api/current.txt

+6 −0
Original line number Diff line number Diff line
@@ -91,6 +91,10 @@ package audio.policy.configuration.V5_0 { 
    enum_constant public static final audio.policy.configuration.V5_0.AudioFormat AUDIO_FORMAT_AAC_ERLC;

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

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

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

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

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

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

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

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

    enum_constant public static final audio.policy.configuration.V5_0.AudioFormat AUDIO_FORMAT_AAC_LTP;
@@ -106,7 +110,9 @@ package audio.policy.configuration.V5_0 { 
    enum_constant public static final audio.policy.configuration.V5_0.AudioFormat AUDIO_FORMAT_AMR_WB_PLUS;

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

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

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

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

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

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

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

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

audio/5.0/config/audio_policy_configuration.xsd

+6 −0
Original line number Diff line number Diff line
@@ -364,6 +364,12 @@ 
            <xs:enumeration value="AUDIO_FORMAT_MAT_2_1"/>

            <xs:enumeration value="AUDIO_FORMAT_AAC_XHE"/>

            <xs:enumeration value="AUDIO_FORMAT_AAC_ADTS_XHE"/>

            <xs:enumeration value="AUDIO_FORMAT_AAC_LATM"/>

            <xs:enumeration value="AUDIO_FORMAT_AAC_LATM_LC"/>

            <xs:enumeration value="AUDIO_FORMAT_AAC_LATM_HE_V1"/>

            <xs:enumeration value="AUDIO_FORMAT_AAC_LATM_HE_V2"/>

            <xs:enumeration value="AUDIO_FORMAT_CELT"/>

            <xs:enumeration value="AUDIO_FORMAT_APTX_ADAPTIVE"/>

        </xs:restriction>

    </xs:simpleType>

    <xs:simpleType name="extendableAudioFormat">

audio/common/5.0/types.hal

+7 −0
Original line number Diff line number Diff line
@@ -235,6 +235,10 @@ enum AudioFormat : uint32_t { 
    LDAC                = 0x23000000UL,

    /** Dolby Metadata-enhanced Audio Transmission */

    MAT                 = 0x24000000UL,

    AAC_LATM            = 0x25000000UL,

    CELT                = 0x26000000UL,

    APTX_ADAPTIVE       = 0x27000000UL,



    /** Deprecated */

    MAIN_MASK           = 0xFF000000UL,

    SUB_MASK            = 0x00FFFFFFUL,
@@ -306,6 +310,9 @@ enum AudioFormat : uint32_t { 
    MAT_1_0             = (MAT | MAT_SUB_1_0),

    MAT_2_0             = (MAT | MAT_SUB_2_0),

    MAT_2_1             = (MAT | MAT_SUB_2_1),

    AAC_LATM_LC         = (AAC_LATM | AAC_SUB_LC),

    AAC_LATM_HE_V1      = (AAC_LATM | AAC_SUB_HE_V1),

    AAC_LATM_HE_V2      = (AAC_LATM | AAC_SUB_HE_V2),

};



/**