Merge "Add video extension OMX_VIDEO_CodingVP9 to support VP9 decoder."

This commit is contained in:
Lajos Molnar 2013-06-25 22:07:39 +00:00 committed by Android (Google) Code Review
commit bfc41519ce
2 changed files with 2 additions and 7 deletions

View File

@ -85,7 +85,8 @@ typedef enum OMX_VIDEO_CODINGTYPE {
OMX_VIDEO_CodingRV, /**< all versions of Real Video */ OMX_VIDEO_CodingRV, /**< all versions of Real Video */
OMX_VIDEO_CodingAVC, /**< H.264/AVC */ OMX_VIDEO_CodingAVC, /**< H.264/AVC */
OMX_VIDEO_CodingMJPEG, /**< Motion JPEG */ OMX_VIDEO_CodingMJPEG, /**< Motion JPEG */
OMX_VIDEO_CodingVPX, /**< Google VPX, formerly known as On2 VP8 */ OMX_VIDEO_CodingVP8, /**< Google VP8, formerly known as On2 VP8 */
OMX_VIDEO_CodingVP9, /**< Google VP9 */
OMX_VIDEO_CodingKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ OMX_VIDEO_CodingKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */
OMX_VIDEO_CodingVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */ OMX_VIDEO_CodingVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */
OMX_VIDEO_CodingMax = 0x7FFFFFFF OMX_VIDEO_CodingMax = 0x7FFFFFFF

View File

@ -58,12 +58,6 @@ typedef struct OMX_NALSTREAMFORMATTYPE{
OMX_NALUFORMATSTYPE eNaluFormat; OMX_NALUFORMATSTYPE eNaluFormat;
} OMX_NALSTREAMFORMATTYPE; } OMX_NALSTREAMFORMATTYPE;
/** Enum for standard video codingtype extensions */
typedef enum OMX_VIDEO_CODINGEXTTYPE {
OMX_VIDEO_ExtCodingUnused = OMX_VIDEO_CodingKhronosExtensions,
OMX_VIDEO_CodingVP8, /**< VP8/WebM */
} OMX_VIDEO_CODINGEXTTYPE;
/** VP8 profiles */ /** VP8 profiles */
typedef enum OMX_VIDEO_VP8PROFILETYPE { typedef enum OMX_VIDEO_VP8PROFILETYPE {
OMX_VIDEO_VP8ProfileMain = 0x01, OMX_VIDEO_VP8ProfileMain = 0x01,