summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVaibhav Deshu Venkatesh <vdeshuve@codeaurora.org>2018-08-30 21:33:07 (GMT)
committerLuca Stefani <luca.stefani.ge1@gmail.com>2019-07-21 14:02:10 (GMT)
commit8a4810c7e65699a69a977f3c60d242dc376ba7f4 (patch)
tree216c9c9c39225f1137543ff1a6a0ae1c19157e02
parent1fe7143a8c349b64c9019d83782fd2d27e65a694 (diff)
downloadframeworks_base-8a4810c7e65699a69a977f3c60d242dc376ba7f4.zip
frameworks_base-8a4810c7e65699a69a977f3c60d242dc376ba7f4.tar.gz
frameworks_base-8a4810c7e65699a69a977f3c60d242dc376ba7f4.tar.bz2
MediaCodecInfo: Add support for level 6.2
Currently max level supported for AVC is 5.2. It is not enough to support 8k resolutions. This change adds support for level upto 6.2. CRs-Fixed: 2306511 Change-Id: I90a8c4ef6fc3c57a93bcf0b47a0d449485b9bc4d
-rw-r--r--media/java/android/media/MediaCodecInfo.java12
1 files changed, 12 insertions, 0 deletions
diff --git a/media/java/android/media/MediaCodecInfo.java b/media/java/android/media/MediaCodecInfo.java
index 2cb58d0..3793dea 100644
--- a/media/java/android/media/MediaCodecInfo.java
+++ b/media/java/android/media/MediaCodecInfo.java
@@ -2098,6 +2098,12 @@ public final class MediaCodecInfo {
MBPS = 983040; FS = 36864; BR = 240000; DPB = 184320; break;
case CodecProfileLevel.AVCLevel52:
MBPS = 2073600; FS = 36864; BR = 240000; DPB = 184320; break;
+ case CodecProfileLevel.AVCLevel6:
+ MBPS = 4177920; FS = 139264; BR = 240000; DPB = 696320; break;
+ case CodecProfileLevel.AVCLevel61:
+ MBPS = 8355840; FS = 139264; BR = 480000; DPB = 696320; break;
+ case CodecProfileLevel.AVCLevel62:
+ MBPS = 16711680; FS = 139264; BR = 800000; DPB = 696320; break;
default:
Log.w(TAG, "Unrecognized level "
+ profileLevel.level + " for " + mime);
@@ -2893,6 +2899,12 @@ public final class MediaCodecInfo {
public static final int AVCLevel5 = 0x4000;
public static final int AVCLevel51 = 0x8000;
public static final int AVCLevel52 = 0x10000;
+ /** @hide */
+ public static final int AVCLevel6 = 0x20000;
+ /** @hide */
+ public static final int AVCLevel61 = 0x40000;
+ /** @hide */
+ public static final int AVCLevel62 = 0x80000;
// from OMX_VIDEO_H263PROFILETYPE
public static final int H263ProfileBaseline = 0x01;