From e72409fe779f620382c5bd0b82f4a32ac91d9fe4 Mon Sep 17 00:00:00 2001 From: Kunter Gultekin Date: Thu, 7 Feb 2013 20:18:45 +0200 Subject: [PATCH] Adds vp8 profile and levels to MediaCodecInfo. In line with ongoing effort of adding vpx encoder to stagefright (https://android-review.googlesource.com/50893) we need to add profile and level values for VP8. VP8 profiles and levels are defined in OMX IL 1.1.2 extension headers, which is also being added here https://android-review.googlesource.com/51272 This alters the public API. Change-Id: I2bbb91c0b8b522b90c3cdfadaba0d18134800408 Signed-off-by: Kunter Gultekin related-to-bug: 8226783 --- api/current.txt | 5 +++++ media/java/android/media/MediaCodecInfo.java | 14 ++++++++++++-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/api/current.txt b/api/current.txt index bbf930256ddc6..00c326cc761f5 100644 --- a/api/current.txt +++ b/api/current.txt @@ -11449,6 +11449,11 @@ package android.media { field public static final int MPEG4ProfileSimpleFBA = 128; // 0x80 field public static final int MPEG4ProfileSimpleFace = 64; // 0x40 field public static final int MPEG4ProfileSimpleScalable = 2; // 0x2 + field public static final int VP8Level_Version0 = 1; // 0x1 + field public static final int VP8Level_Version1 = 2; // 0x2 + field public static final int VP8Level_Version2 = 4; // 0x4 + field public static final int VP8Level_Version3 = 8; // 0x8 + field public static final int VP8ProfileMain = 1; // 0x1 field public int level; field public int profile; } diff --git a/media/java/android/media/MediaCodecInfo.java b/media/java/android/media/MediaCodecInfo.java index 4398642fde959..f6593e051bbe2 100644 --- a/media/java/android/media/MediaCodecInfo.java +++ b/media/java/android/media/MediaCodecInfo.java @@ -191,17 +191,27 @@ public final class MediaCodecInfo { public static final int AACObjectHE_PS = 29; public static final int AACObjectELD = 39; + // from OMX_VIDEO_VP8LEVELTYPE + public static final int VP8Level_Version0 = 0x01; + public static final int VP8Level_Version1 = 0x02; + public static final int VP8Level_Version2 = 0x04; + public static final int VP8Level_Version3 = 0x08; + + // from OMX_VIDEO_VP8PROFILETYPE + public static final int VP8ProfileMain = 0x01; + + /** * Defined in the OpenMAX IL specs, depending on the type of media * this can be OMX_VIDEO_AVCPROFILETYPE, OMX_VIDEO_H263PROFILETYPE, - * or OMX_VIDEO_MPEG4PROFILETYPE. + * OMX_VIDEO_MPEG4PROFILETYPE or OMX_VIDEO_VP8PROFILETYPE. */ public int profile; /** * Defined in the OpenMAX IL specs, depending on the type of media * this can be OMX_VIDEO_AVCLEVELTYPE, OMX_VIDEO_H263LEVELTYPE - * or OMX_VIDEO_MPEG4LEVELTYPE. + * OMX_VIDEO_MPEG4LEVELTYPE or OMX_VIDEO_VP8LEVELTYPE. */ public int level; };