From 5755817422700f6f5e8380921d1f5a728b677dd2 Mon Sep 17 00:00:00 2001 From: Ronghua Wu Date: Fri, 8 Jan 2016 17:40:50 +0000 Subject: [PATCH] Revert "media: Add MIMETYPE_VIDEO_DOLBY_AVC and MIMETYPE_VIDEO_DOLBY_HEVC." This reverts commit 58a30f1cf68e0f0bc9e6f270b0f0703fcd74c6c0. Change-Id: I067892ea5a70f366ef20c45781616715705f4ec4 --- api/current.txt | 2 -- api/system-current.txt | 2 -- api/test-current.txt | 2 -- media/java/android/media/MediaCodecInfo.java | 6 ++---- media/java/android/media/MediaFormat.java | 2 -- 5 files changed, 2 insertions(+), 12 deletions(-) diff --git a/api/current.txt b/api/current.txt index f6b4d6105c003..efb3f979c2a17 100644 --- a/api/current.txt +++ b/api/current.txt @@ -20320,8 +20320,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"; diff --git a/api/system-current.txt b/api/system-current.txt index bf4fc5004b16a..e2ea88883f9dc 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -21618,8 +21618,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"; diff --git a/api/test-current.txt b/api/test-current.txt index 8ff46c2ef2675..848ce4a3da92a 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -20328,8 +20328,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"; diff --git a/media/java/android/media/MediaCodecInfo.java b/media/java/android/media/MediaCodecInfo.java index 9bcb5e35938bc..0fba9925b6c16 100644 --- a/media/java/android/media/MediaCodecInfo.java +++ b/media/java/android/media/MediaCodecInfo.java @@ -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; diff --git a/media/java/android/media/MediaFormat.java b/media/java/android/media/MediaFormat.java index a102e51de3d0a..b2fa0acf7f57d 100644 --- a/media/java/android/media/MediaFormat.java +++ b/media/java/android/media/MediaFormat.java @@ -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";