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

Commit 66d96977 authored by Ronghua Wu's avatar Ronghua Wu Committed by Android (Google) Code Review
Browse files

Merge "media: Add MIMETYPE_VIDEO_DOLBY_VISION."

parents 370f0fed 005cb416

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -20429,6 +20429,7 @@ package android.media { 
    field public static final java.lang.String MIMETYPE_TEXT_CEA_608 = "text/cea-608";

    field public static final java.lang.String MIMETYPE_TEXT_VTT = "text/vtt";

    field public static final java.lang.String MIMETYPE_VIDEO_AVC = "video/avc";

    field public static final java.lang.String MIMETYPE_VIDEO_DOLBY_VISION = "video/dolby-vision";

    field public static final java.lang.String MIMETYPE_VIDEO_H263 = "video/3gpp";

    field public static final java.lang.String MIMETYPE_VIDEO_HEVC = "video/hevc";

    field public static final java.lang.String MIMETYPE_VIDEO_MPEG2 = "video/mpeg2";

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -21739,6 +21739,7 @@ package android.media { 
    field public static final java.lang.String MIMETYPE_TEXT_CEA_608 = "text/cea-608";

    field public static final java.lang.String MIMETYPE_TEXT_VTT = "text/vtt";

    field public static final java.lang.String MIMETYPE_VIDEO_AVC = "video/avc";

    field public static final java.lang.String MIMETYPE_VIDEO_DOLBY_VISION = "video/dolby-vision";

    field public static final java.lang.String MIMETYPE_VIDEO_H263 = "video/3gpp";

    field public static final java.lang.String MIMETYPE_VIDEO_HEVC = "video/hevc";

    field public static final java.lang.String MIMETYPE_VIDEO_MPEG2 = "video/mpeg2";

api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -20437,6 +20437,7 @@ package android.media { 
    field public static final java.lang.String MIMETYPE_TEXT_CEA_608 = "text/cea-608";

    field public static final java.lang.String MIMETYPE_TEXT_VTT = "text/vtt";

    field public static final java.lang.String MIMETYPE_VIDEO_AVC = "video/avc";

    field public static final java.lang.String MIMETYPE_VIDEO_DOLBY_VISION = "video/dolby-vision";

    field public static final java.lang.String MIMETYPE_VIDEO_H263 = "video/3gpp";

    field public static final java.lang.String MIMETYPE_VIDEO_HEVC = "video/hevc";

    field public static final java.lang.String MIMETYPE_VIDEO_MPEG2 = "video/mpeg2";

media/java/android/media/MediaFormat.java

+1 −0
Original line number Diff line number Diff line
@@ -107,6 +107,7 @@ public final class MediaFormat { 
    public static final String MIMETYPE_AUDIO_MSGSM = "audio/gsm";

    public static final String MIMETYPE_AUDIO_AC3 = "audio/ac3";

    public static final String MIMETYPE_AUDIO_EAC3 = "audio/eac3";

    public static final String MIMETYPE_VIDEO_DOLBY_VISION = "video/dolby-vision";



    /**

     * MIME type for WebVTT subtitle data.