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

Commit 66e55bfd authored by jiabin's avatar jiabin Committed by Jiabin Huang
Browse files

Add MPEG-H enum. 

MPEG-H is a new surround audio codec. Add new enum format for MPEG-H in
the HIDL interface. Though MPEG-H has different profiles and audio
levels, only low complexity and baseline with audio level as 3 and 4 is
defined in this CL as they are relevant for the current and upcoming
commercial services.

Bug: 178619392
Test: make
Change-Id: I5672f3874f6cffe31a83b6d7e351d0bf56bfd038
Merged-In: I5672f3874f6cffe31a83b6d7e351d0bf56bfd038
parent 49ad4f04

audio/7.0/config/api/current.txt

+4 −0
Original line number Diff line number Diff line
@@ -223,6 +223,10 @@ package android.audio.policy.configuration.V7_0 { 
    enum_constant public static final android.audio.policy.configuration.V7_0.AudioFormat AUDIO_FORMAT_MAT_2_1;

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

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

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

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

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

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

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

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

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

audio/7.0/config/audio_policy_configuration.xsd

+4 −0
Original line number Diff line number Diff line
@@ -407,6 +407,10 @@ 
            <xs:enumeration value="AUDIO_FORMAT_LHDC_LL"/>

            <xs:enumeration value="AUDIO_FORMAT_APTX_TWSP"/>

            <xs:enumeration value="AUDIO_FORMAT_LC3"/>

            <xs:enumeration value="AUDIO_FORMAT_MPEGH_BL_L3"/>

            <xs:enumeration value="AUDIO_FORMAT_MPEGH_BL_L4"/>

            <xs:enumeration value="AUDIO_FORMAT_MPEGH_LC_L3"/>

            <xs:enumeration value="AUDIO_FORMAT_MPEGH_LC_L4"/>

        </xs:restriction>

    </xs:simpleType>

    <xs:simpleType name="extendableAudioFormat">