diff options
| author | Lajos Molnar <lajos@google.com> | 2013-06-25 22:07:39 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-06-25 22:07:39 +0000 |
| commit | bfc41519ce0ee04c7ec2681054d4a0f809ad0893 (patch) | |
| tree | 56ac1e05e18ec91b1b704b9b35c7c2c72e1fb327 /include/media | |
| parent | 00e595f10f9a3a009b55c982b4f9fab3d18e5333 (diff) | |
| parent | 5195e0808bbc0438f076c1ca92d3c257d64b7ca1 (diff) | |
| download | frameworks_native-bfc41519ce0ee04c7ec2681054d4a0f809ad0893.zip frameworks_native-bfc41519ce0ee04c7ec2681054d4a0f809ad0893.tar.gz frameworks_native-bfc41519ce0ee04c7ec2681054d4a0f809ad0893.tar.bz2 | |
Merge "Add video extension OMX_VIDEO_CodingVP9 to support VP9 decoder."
Diffstat (limited to 'include/media')
| -rw-r--r-- | include/media/openmax/OMX_Video.h | 3 | ||||
| -rw-r--r-- | include/media/openmax/OMX_VideoExt.h | 6 |
2 files changed, 2 insertions, 7 deletions
diff --git a/include/media/openmax/OMX_Video.h b/include/media/openmax/OMX_Video.h index 4f8485d..4441a7a 100644 --- a/include/media/openmax/OMX_Video.h +++ b/include/media/openmax/OMX_Video.h @@ -85,7 +85,8 @@ typedef enum OMX_VIDEO_CODINGTYPE { OMX_VIDEO_CodingRV, /**< all versions of Real Video */ OMX_VIDEO_CodingAVC, /**< H.264/AVC */ 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_CodingVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */ OMX_VIDEO_CodingMax = 0x7FFFFFFF diff --git a/include/media/openmax/OMX_VideoExt.h b/include/media/openmax/OMX_VideoExt.h index 5e79b47..fa24168 100644 --- a/include/media/openmax/OMX_VideoExt.h +++ b/include/media/openmax/OMX_VideoExt.h @@ -58,12 +58,6 @@ typedef struct OMX_NALSTREAMFORMATTYPE{ OMX_NALUFORMATSTYPE eNaluFormat; } 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 */ typedef enum OMX_VIDEO_VP8PROFILETYPE { OMX_VIDEO_VP8ProfileMain = 0x01, |