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

Commit 257c8fa4 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "audio: add IAMF formats to schema" into main

parents c90143e7 8f594b5b

audio/aidl/default/config/audioPolicy/api/current.txt

+12 −0
Original line number Diff line number Diff line
@@ -223,6 +223,18 @@ package android.audio.policy.configuration { 
    enum_constant public static final android.audio.policy.configuration.AudioFormat AUDIO_FORMAT_FLAC;

    enum_constant public static final android.audio.policy.configuration.AudioFormat AUDIO_FORMAT_HE_AAC_V1;

    enum_constant public static final android.audio.policy.configuration.AudioFormat AUDIO_FORMAT_HE_AAC_V2;

    enum_constant public static final android.audio.policy.configuration.AudioFormat AUDIO_FORMAT_IAMF_BASE_AAC;

    enum_constant public static final android.audio.policy.configuration.AudioFormat AUDIO_FORMAT_IAMF_BASE_ENHANCED_AAC;

    enum_constant public static final android.audio.policy.configuration.AudioFormat AUDIO_FORMAT_IAMF_BASE_ENHANCED_FLAC;

    enum_constant public static final android.audio.policy.configuration.AudioFormat AUDIO_FORMAT_IAMF_BASE_ENHANCED_OPUS;

    enum_constant public static final android.audio.policy.configuration.AudioFormat AUDIO_FORMAT_IAMF_BASE_ENHANCED_PCM;

    enum_constant public static final android.audio.policy.configuration.AudioFormat AUDIO_FORMAT_IAMF_BASE_FLAC;

    enum_constant public static final android.audio.policy.configuration.AudioFormat AUDIO_FORMAT_IAMF_BASE_OPUS;

    enum_constant public static final android.audio.policy.configuration.AudioFormat AUDIO_FORMAT_IAMF_BASE_PCM;

    enum_constant public static final android.audio.policy.configuration.AudioFormat AUDIO_FORMAT_IAMF_SIMPLE_AAC;

    enum_constant public static final android.audio.policy.configuration.AudioFormat AUDIO_FORMAT_IAMF_SIMPLE_FLAC;

    enum_constant public static final android.audio.policy.configuration.AudioFormat AUDIO_FORMAT_IAMF_SIMPLE_OPUS;

    enum_constant public static final android.audio.policy.configuration.AudioFormat AUDIO_FORMAT_IAMF_SIMPLE_PCM;

    enum_constant public static final android.audio.policy.configuration.AudioFormat AUDIO_FORMAT_IEC60958;

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

    enum_constant public static final android.audio.policy.configuration.AudioFormat AUDIO_FORMAT_LC3;

audio/aidl/default/config/audioPolicy/audio_policy_configuration.xsd

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

            <xs:enumeration value="AUDIO_FORMAT_DTS_HD_MA"/>

            <xs:enumeration value="AUDIO_FORMAT_DTS_UHD_P2"/>

            <xs:enumeration value="AUDIO_FORMAT_IAMF_SIMPLE_OPUS"/>

            <xs:enumeration value="AUDIO_FORMAT_IAMF_SIMPLE_AAC"/>

            <xs:enumeration value="AUDIO_FORMAT_IAMF_SIMPLE_PCM"/>

            <xs:enumeration value="AUDIO_FORMAT_IAMF_SIMPLE_FLAC"/>

            <xs:enumeration value="AUDIO_FORMAT_IAMF_BASE_OPUS"/>

            <xs:enumeration value="AUDIO_FORMAT_IAMF_BASE_AAC"/>

            <xs:enumeration value="AUDIO_FORMAT_IAMF_BASE_PCM"/>

            <xs:enumeration value="AUDIO_FORMAT_IAMF_BASE_FLAC"/>

            <xs:enumeration value="AUDIO_FORMAT_IAMF_BASE_ENHANCED_OPUS"/>

            <xs:enumeration value="AUDIO_FORMAT_IAMF_BASE_ENHANCED_AAC"/>

            <xs:enumeration value="AUDIO_FORMAT_IAMF_BASE_ENHANCED_PCM"/>

            <xs:enumeration value="AUDIO_FORMAT_IAMF_BASE_ENHANCED_FLAC"/>

        </xs:restriction>

    </xs:simpleType>

    <xs:simpleType name="extendableAudioFormat">