diff options
Diffstat (limited to 'mm-core/inc')
| -rwxr-xr-x | mm-core/inc/OMX_QCOMExtns.h | 7 | ||||
| -rw-r--r-- | mm-core/inc/OMX_Video.h | 4 | ||||
| -rw-r--r-- | mm-core/inc/OMX_VideoExt.h | 6 |
3 files changed, 12 insertions, 5 deletions
diff --git a/mm-core/inc/OMX_QCOMExtns.h b/mm-core/inc/OMX_QCOMExtns.h index a7571a74..47b87af3 100755 --- a/mm-core/inc/OMX_QCOMExtns.h +++ b/mm-core/inc/OMX_QCOMExtns.h @@ -46,6 +46,7 @@ extern "C" { #include "OMX_Core.h" #include "OMX_Video.h" #include "string.h" +#include "OMX_VideoExt.h" #define OMX_VIDEO_MAX_HP_LAYERS 6 @@ -1513,10 +1514,10 @@ typedef enum QOMX_VIDEO_AVCPROFILETYPE { QOMX_VIDEO_AVCProfileHigh10 = OMX_VIDEO_AVCProfileHigh10, QOMX_VIDEO_AVCProfileHigh422 = OMX_VIDEO_AVCProfileHigh422, QOMX_VIDEO_AVCProfileHigh444 = OMX_VIDEO_AVCProfileHigh444, + QOMX_VIDEO_AVCProfileConstrainedBaseline = OMX_VIDEO_AVCProfileConstrainedBaseline, + QOMX_VIDEO_AVCProfileConstrainedHigh = OMX_VIDEO_AVCProfileConstrainedHigh, /* QCom specific profile indexes */ - QOMX_VIDEO_AVCProfileConstrained = OMX_VIDEO_AVCProfileVendorStartUnused, - QOMX_VIDEO_AVCProfileConstrainedBaseline, - QOMX_VIDEO_AVCProfileConstrainedHigh, + QOMX_VIDEO_AVCProfileConstrained = OMX_VIDEO_AVCProfileVendorStartUnused } QOMX_VIDEO_AVCPROFILETYPE; diff --git a/mm-core/inc/OMX_Video.h b/mm-core/inc/OMX_Video.h index a5568fe3..4ac60716 100644 --- a/mm-core/inc/OMX_Video.h +++ b/mm-core/inc/OMX_Video.h @@ -1,5 +1,5 @@ /** - * Copyright (c) 2008, 2018 The Khronos Group Inc. + * Copyright (c) 2008 The Khronos Group Inc. * * Permission is hereby granted, free of charge, to any person obtaining * a copy of this software and associated documentation files (the @@ -71,7 +71,7 @@ typedef enum OMX_VIDEO_CODINGTYPE { OMX_VIDEO_CodingVP8, /**< Google VP8, formerly known as On2 VP8 */ OMX_VIDEO_CodingVP9, /**< Google VP9 */ OMX_VIDEO_CodingHEVC, /**< HEVC */ - OMX_VIDEO_CodingHEIC = 13, /**< HEIC */ + OMX_VIDEO_CodingImageHEIC = 13, /**< HEIC */ 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/mm-core/inc/OMX_VideoExt.h b/mm-core/inc/OMX_VideoExt.h index 758b8be7..b77c6b39 100644 --- a/mm-core/inc/OMX_VideoExt.h +++ b/mm-core/inc/OMX_VideoExt.h @@ -58,6 +58,12 @@ typedef struct OMX_NALSTREAMFORMATTYPE{ OMX_NALUFORMATSTYPE eNaluFormat; } OMX_NALSTREAMFORMATTYPE; +/** AVC additional profiles */ +typedef enum OMX_VIDEO_AVCPROFILEEXTTYPE { + OMX_VIDEO_AVCProfileConstrainedBaseline = 0x10000, /**< Constrained baseline profile */ + OMX_VIDEO_AVCProfileConstrainedHigh = 0x80000, /**< Constrained high profile */ +} OMX_VIDEO_AVCPROFILEEXTTYPE; + /** VP8 profiles */ typedef enum OMX_VIDEO_VP8PROFILETYPE { OMX_VIDEO_VP8ProfileMain = 0x01, |