summaryrefslogtreecommitdiff
path: root/mm-core/inc/OMX_QCOMExtns.h
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2019-09-04 13:34:21 -0700
committerXin Li <delphij@google.com>2019-09-04 13:34:21 -0700
commit6e57c01c492e8cb83d7d72f29977ff9036325bef (patch)
tree0e3600a80cd4c3877072c5175132c350fddd287a /mm-core/inc/OMX_QCOMExtns.h
parent5e2c282ac195052e8fb7845d5e40f491b83032a7 (diff)
parentcffd9b6e6b35ae346198dd6667999fa79da702ac (diff)
downloadmedia-6e57c01c492e8cb83d7d72f29977ff9036325bef.tar.gz
DO NOT MERGE - Merge Android 10 into masterndk-sysroot-r21
Bug: 139893257 Change-Id: Id34b9a5175c55e22b1c2f2d1b3fb62a7e5f497d6
Diffstat (limited to 'mm-core/inc/OMX_QCOMExtns.h')
-rwxr-xr-xmm-core/inc/OMX_QCOMExtns.h7
1 files changed, 4 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;