diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2018-08-28 19:03:03 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-08-28 19:03:03 -0700 |
| commit | 786388135f4f4d39f353e5dfade4ca375ea37c01 (patch) | |
| tree | ed2261c292f863da5a44c8a72d4d898ce7c94c4f | |
| parent | 3a24870b98923b5dc96950e608a8da6d509ea0f2 (diff) | |
| parent | fbd57483c9f38790eec66fa4e28e4ecf299f6101 (diff) | |
| download | media-786388135f4f4d39f353e5dfade4ca375ea37c01.tar.gz | |
Merge "media: use native Constrained high/base profile"
| -rwxr-xr-x | mm-core/inc/OMX_QCOMExtns.h | 7 | ||||
| -rw-r--r-- | mm-core/inc/OMX_VideoExt.h | 6 |
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, |