Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bfc41519 authored by Lajos Molnar's avatar Lajos Molnar Committed by Android (Google) Code Review
Browse files

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

parents 00e595f1 5195e080

include/media/openmax/OMX_Video.h

+2 −1
Original line number Diff line number Diff line
@@ -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

include/media/openmax/OMX_VideoExt.h

+0 −6
Original line number Diff line number Diff line
@@ -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,