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

Commit 3eb382c3 authored by Andy Hung's avatar Andy Hung Committed by Automerger Merge Worker
Browse files

Merge "MediaFormat: new MIME types for MPEG-H audio" am: fae80ba7 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1682765

Change-Id: Ibd8ea777e76acb2577ed61b120efe5075b1928b3
parents 32010fbb fae80ba7

core/api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -21440,6 +21440,8 @@ package android.media { 
    field public static final String MIMETYPE_AUDIO_G711_ALAW = "audio/g711-alaw";

    field public static final String MIMETYPE_AUDIO_G711_MLAW = "audio/g711-mlaw";

    field public static final String MIMETYPE_AUDIO_MPEG = "audio/mpeg";

    field public static final String MIMETYPE_AUDIO_MPEGH_MHA1 = "audio/mha1";

    field public static final String MIMETYPE_AUDIO_MPEGH_MHM1 = "audio/mhm1";

    field public static final String MIMETYPE_AUDIO_MSGSM = "audio/gsm";

    field public static final String MIMETYPE_AUDIO_OPUS = "audio/opus";

    field public static final String MIMETYPE_AUDIO_QCELP = "audio/qcelp";

media/java/android/media/MediaFormat.java

+4 −0
Original line number Diff line number Diff line
@@ -169,6 +169,10 @@ public final class MediaFormat { 
    public static final String MIMETYPE_AUDIO_EAC3_JOC = "audio/eac3-joc";

    public static final String MIMETYPE_AUDIO_AC4 = "audio/ac4";

    public static final String MIMETYPE_AUDIO_SCRAMBLED = "audio/scrambled";

    /** MIME type for MPEG-H Audio single stream */

    public static final String MIMETYPE_AUDIO_MPEGH_MHA1 = "audio/mha1";

    /** MIME type for MPEG-H Audio single stream, encapsulated in MHAS */

    public static final String MIMETYPE_AUDIO_MPEGH_MHM1 = "audio/mhm1";



    /**

     * MIME type for HEIF still image data encoded in HEVC.