summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUma Mehta <umamehta@codeaurora.org>2018-08-10 14:24:05 +0530
committerSanthosh Behara <santhoshbehara@codeaurora.org>2018-08-20 15:58:16 +0530
commitfbd57483c9f38790eec66fa4e28e4ecf299f6101 (patch)
treeaa26458e2f09208ff6f118fae2b1f29f1736b71f
parentbb9c206ab9a8b4fe24e500f626e3810c69ce773d (diff)
downloadmedia-fbd57483c9f38790eec66fa4e28e4ecf299f6101.tar.gz
media: use native Constrained high/base profile
CBP/CHP is supported at native layer, hence using the same in place of vendor extension. Change-Id: I280cf24f9ce394ca5ed9beec4a3a93a68fe5ae1d
-rwxr-xr-xmm-core/inc/OMX_QCOMExtns.h7
-rw-r--r--mm-core/inc/OMX_VideoExt.h6
2 files changed, 10 insertions, 3 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_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,