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

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

Merge "Revert "media: Add MIMETYPE_VIDEO_DOLBY_AVC and MIMETYPE_VIDEO_DOLBY_HEVC.""

parents 88ca5398 57558174

api/current.txt

+0 −2
Original line number Diff line number Diff line
@@ -20371,8 +20371,6 @@ 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_AVC = "video/dolby-avc";

    field public static final java.lang.String MIMETYPE_VIDEO_DOLBY_HEVC = "video/dolby-hevc";

    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

+0 −2
Original line number Diff line number Diff line
@@ -21670,8 +21670,6 @@ 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_AVC = "video/dolby-avc";

    field public static final java.lang.String MIMETYPE_VIDEO_DOLBY_HEVC = "video/dolby-hevc";

    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

+0 −2
Original line number Diff line number Diff line
@@ -20379,8 +20379,6 @@ 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_AVC = "video/dolby-avc";

    field public static final java.lang.String MIMETYPE_VIDEO_DOLBY_HEVC = "video/dolby-hevc";

    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/MediaCodecInfo.java

+2 −4
Original line number Diff line number Diff line
@@ -1735,8 +1735,7 @@ public final class MediaCodecInfo { 
            CodecProfileLevel[] profileLevels = mParent.profileLevels;

            String mime = mParent.getMimeType();



            if (mime.equalsIgnoreCase(MediaFormat.MIMETYPE_VIDEO_AVC) ||

                    mime.equalsIgnoreCase(MediaFormat.MIMETYPE_VIDEO_DOLBY_AVC)) {

            if (mime.equalsIgnoreCase(MediaFormat.MIMETYPE_VIDEO_AVC)) {

                maxBlocks = 99;

                maxBlocksPerSecond = 1485;

                maxBps = 64000;
@@ -2090,8 +2089,7 @@ public final class MediaCodecInfo { 
                applyMacroBlockLimits(Short.MAX_VALUE, Short.MAX_VALUE,

                        maxBlocks, maxBlocksPerSecond, blockSize, blockSize,

                        1 /* widthAlignment */, 1 /* heightAlignment */);

            } else if (mime.equalsIgnoreCase(MediaFormat.MIMETYPE_VIDEO_HEVC) ||

                    mime.equalsIgnoreCase(MediaFormat.MIMETYPE_VIDEO_DOLBY_HEVC)) {

            } else if (mime.equalsIgnoreCase(MediaFormat.MIMETYPE_VIDEO_HEVC)) {

                maxBlocks = 36864;

                maxBlocksPerSecond = maxBlocks * 15;

                maxBps = 128000;

media/java/android/media/MediaFormat.java

+0 −2
Original line number Diff line number Diff line
@@ -92,8 +92,6 @@ public final class MediaFormat { 
    public static final String MIMETYPE_VIDEO_H263 = "video/3gpp";

    public static final String MIMETYPE_VIDEO_MPEG2 = "video/mpeg2";

    public static final String MIMETYPE_VIDEO_RAW = "video/raw";

    public static final String MIMETYPE_VIDEO_DOLBY_AVC = "video/dolby-avc";

    public static final String MIMETYPE_VIDEO_DOLBY_HEVC = "video/dolby-hevc";



    public static final String MIMETYPE_AUDIO_AMR_NB = "audio/3gpp";

    public static final String MIMETYPE_AUDIO_AMR_WB = "audio/amr-wb";