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

Commit 57558174 authored Jan 08, 2016 by Ronghua Wu

Revert "media: Add MIMETYPE_VIDEO_DOLBY_AVC and MIMETYPE_VIDEO_DOLBY_HEVC."

This reverts commit 58a30f1c.

Change-Id: I067892ea5a70f366ef20c45781616715705f4ec4

parent 2d20a4dc

api/current.txt

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -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_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_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_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_H263 = "video/3gpp";
	field public static final java.lang.String MIMETYPE_VIDEO_HEVC = "video/hevc";		field public static final java.lang.String MIMETYPE_VIDEO_HEVC = "video/hevc";
	field public static final java.lang.String MIMETYPE_VIDEO_MPEG2 = "video/mpeg2";		field public static final java.lang.String MIMETYPE_VIDEO_MPEG2 = "video/mpeg2";

api/system-current.txt

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -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_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_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_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_H263 = "video/3gpp";
	field public static final java.lang.String MIMETYPE_VIDEO_HEVC = "video/hevc";		field public static final java.lang.String MIMETYPE_VIDEO_HEVC = "video/hevc";
	field public static final java.lang.String MIMETYPE_VIDEO_MPEG2 = "video/mpeg2";		field public static final java.lang.String MIMETYPE_VIDEO_MPEG2 = "video/mpeg2";

api/test-current.txt

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -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_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_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_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_H263 = "video/3gpp";
	field public static final java.lang.String MIMETYPE_VIDEO_HEVC = "video/hevc";		field public static final java.lang.String MIMETYPE_VIDEO_HEVC = "video/hevc";
	field public static final java.lang.String MIMETYPE_VIDEO_MPEG2 = "video/mpeg2";		field public static final java.lang.String MIMETYPE_VIDEO_MPEG2 = "video/mpeg2";

media/java/android/media/MediaCodecInfo.java

+2 −4

Original line number	Original line	Diff line number	Diff line
	@@ -1735,8 +1735,7 @@ public final class MediaCodecInfo {
	CodecProfileLevel[] profileLevels = mParent.profileLevels;		CodecProfileLevel[] profileLevels = mParent.profileLevels;
	String mime = mParent.getMimeType();		String mime = mParent.getMimeType();

	if (mime.equalsIgnoreCase(MediaFormat.MIMETYPE_VIDEO_AVC) \|\|		if (mime.equalsIgnoreCase(MediaFormat.MIMETYPE_VIDEO_AVC)) {
	mime.equalsIgnoreCase(MediaFormat.MIMETYPE_VIDEO_DOLBY_AVC)) {
	maxBlocks = 99;		maxBlocks = 99;
	maxBlocksPerSecond = 1485;		maxBlocksPerSecond = 1485;
	maxBps = 64000;		maxBps = 64000;
	@@ -2090,8 +2089,7 @@ public final class MediaCodecInfo {
	applyMacroBlockLimits(Short.MAX_VALUE, Short.MAX_VALUE,		applyMacroBlockLimits(Short.MAX_VALUE, Short.MAX_VALUE,
	maxBlocks, maxBlocksPerSecond, blockSize, blockSize,		maxBlocks, maxBlocksPerSecond, blockSize, blockSize,
	1 /* widthAlignment /, 1 / heightAlignment */);		1 /* widthAlignment /, 1 / heightAlignment */);
	} else if (mime.equalsIgnoreCase(MediaFormat.MIMETYPE_VIDEO_HEVC) \|\|		} else if (mime.equalsIgnoreCase(MediaFormat.MIMETYPE_VIDEO_HEVC)) {
	mime.equalsIgnoreCase(MediaFormat.MIMETYPE_VIDEO_DOLBY_HEVC)) {
	maxBlocks = 36864;		maxBlocks = 36864;
	maxBlocksPerSecond = maxBlocks * 15;		maxBlocksPerSecond = maxBlocks * 15;
	maxBps = 128000;		maxBps = 128000;

media/java/android/media/MediaFormat.java

+0 −2

Original line number	Original line	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_H263 = "video/3gpp";
	public static final String MIMETYPE_VIDEO_MPEG2 = "video/mpeg2";		public static final String MIMETYPE_VIDEO_MPEG2 = "video/mpeg2";
	public static final String MIMETYPE_VIDEO_RAW = "video/raw";		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_NB = "audio/3gpp";
	public static final String MIMETYPE_AUDIO_AMR_WB = "audio/amr-wb";		public static final String MIMETYPE_AUDIO_AMR_WB = "audio/amr-wb";