From 9da5f1ba583d8e42b6690ddf414298a947c8f07f Mon Sep 17 00:00:00 2001 From: Lajos Molnar Date: Wed, 19 Jul 2017 15:35:09 -0700 Subject: [PATCH] media: Add constants for CBP and CHP for AVC codecs Bug: 63864332 Change-Id: Ifd6b8c097df2ca8e706d5797ad9c1e7e7d02b6bc --- api/current.txt | 2 ++ api/system-current.txt | 2 ++ api/test-current.txt | 2 ++ media/java/android/media/MediaCodecInfo.java | 2 ++ 4 files changed, 8 insertions(+) diff --git a/api/current.txt b/api/current.txt index 65935aee66578..666e8a83241c7 100644 --- a/api/current.txt +++ b/api/current.txt @@ -22170,6 +22170,8 @@ package android.media { field public static final int AVCLevel51 = 32768; // 0x8000 field public static final int AVCLevel52 = 65536; // 0x10000 field public static final int AVCProfileBaseline = 1; // 0x1 + field public static final int AVCProfileConstrainedBaseline = 65536; // 0x10000 + field public static final int AVCProfileConstrainedHigh = 524288; // 0x80000 field public static final int AVCProfileExtended = 4; // 0x4 field public static final int AVCProfileHigh = 8; // 0x8 field public static final int AVCProfileHigh10 = 16; // 0x10 diff --git a/api/system-current.txt b/api/system-current.txt index 9e4bad8ccd917..12d3bec0d76b8 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -24111,6 +24111,8 @@ package android.media { field public static final int AVCLevel51 = 32768; // 0x8000 field public static final int AVCLevel52 = 65536; // 0x10000 field public static final int AVCProfileBaseline = 1; // 0x1 + field public static final int AVCProfileConstrainedBaseline = 65536; // 0x10000 + field public static final int AVCProfileConstrainedHigh = 524288; // 0x80000 field public static final int AVCProfileExtended = 4; // 0x4 field public static final int AVCProfileHigh = 8; // 0x8 field public static final int AVCProfileHigh10 = 16; // 0x10 diff --git a/api/test-current.txt b/api/test-current.txt index f08936247926b..bcc7b00c6a291 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -22281,6 +22281,8 @@ package android.media { field public static final int AVCLevel51 = 32768; // 0x8000 field public static final int AVCLevel52 = 65536; // 0x10000 field public static final int AVCProfileBaseline = 1; // 0x1 + field public static final int AVCProfileConstrainedBaseline = 65536; // 0x10000 + field public static final int AVCProfileConstrainedHigh = 524288; // 0x80000 field public static final int AVCProfileExtended = 4; // 0x4 field public static final int AVCProfileHigh = 8; // 0x8 field public static final int AVCProfileHigh10 = 16; // 0x10 diff --git a/media/java/android/media/MediaCodecInfo.java b/media/java/android/media/MediaCodecInfo.java index a19726cb26478..e2642c91a6b39 100644 --- a/media/java/android/media/MediaCodecInfo.java +++ b/media/java/android/media/MediaCodecInfo.java @@ -2861,6 +2861,8 @@ public final class MediaCodecInfo { public static final int AVCProfileHigh10 = 0x10; public static final int AVCProfileHigh422 = 0x20; public static final int AVCProfileHigh444 = 0x40; + public static final int AVCProfileConstrainedBaseline = 0x10000; + public static final int AVCProfileConstrainedHigh = 0x80000; // from OMX_VIDEO_AVCLEVELTYPE public static final int AVCLevel1 = 0x01;