diff options
author | bolunliu <bolun.liu@intel.com> | 2014-03-25 15:49:26 +0800 |
---|---|---|
committer | Patrick Tjin <pattjin@google.com> | 2014-07-21 22:03:43 -0700 |
commit | 536f092125a0a1b5a60aa60690a2393c83b3848a (patch) | |
tree | 542bb537f09fdf83736a83c33e85c3d82d74b83c /core | |
parent | 7692ea07c8340f27d4b63da5ab46e06b4c6b5df3 (diff) | |
download | wrs_omxil_core-536f092125a0a1b5a60aa60690a2393c83b3848a.tar.gz |
Remove temporal layer data structure.
BZ: 179113
Remove temporal layer data structure.
Add nMaxQP/nFrameRate/nTemporalID in ConfigIntelBitRateType
Add GetExtensionIndex for temporal layer vp8 encode
Refine code style.Remove meaningless modification.
Change-Id: I0ff98d73d69b40c207aa770bc26f0d910cdf37fd
Signed-off-by: bolunliu <bolun.liu@intel.com>
Diffstat (limited to 'core')
-rw-r--r-- | core/inc/khronos/openmax/include/OMX_IntelIndexExt.h | 3 | ||||
-rw-r--r-- | core/inc/khronos/openmax/include/OMX_IntelVideoExt.h | 16 |
2 files changed, 6 insertions, 13 deletions
diff --git a/core/inc/khronos/openmax/include/OMX_IntelIndexExt.h b/core/inc/khronos/openmax/include/OMX_IntelIndexExt.h index 401677a..e395f79 100644 --- a/core/inc/khronos/openmax/include/OMX_IntelIndexExt.h +++ b/core/inc/khronos/openmax/include/OMX_IntelIndexExt.h @@ -68,8 +68,7 @@ typedef enum OMX_INTELINDEXEXTTYPE { OMX_IndexExtPrepareForAdaptivePlayback, /**<reference: Prepare for AdaptivePlayback*/ OMX_IndexExtVP8ForceKFrame, /**<reference: For VP8 Force K Frame*/ OMX_IndexExtVP8MaxFrameSizeRatio, /**<reference: For VP8 Max Frame Size*/ - OMX_IndexExtVP8NumberOfTemporalLayer, /**<reference: For SAND VP8 Number of Layer*/ - OMX_IndexExtVP8TemporalLayerBitRateFrameRate, /**<reference: For SAND VP8 bitrate and framerate for every layer*/ + OMX_IndexExtNumberOfTemporalLayer, /**<reference: For Number of Layer*/ // Index for VPP must always be put at the end #ifdef TARGET_HAS_VPP OMX_IndexExtVppBufferNum, /**<reference: vpp buffer number*/ diff --git a/core/inc/khronos/openmax/include/OMX_IntelVideoExt.h b/core/inc/khronos/openmax/include/OMX_IntelVideoExt.h index 1e7bba0..bd2a8ed 100644 --- a/core/inc/khronos/openmax/include/OMX_IntelVideoExt.h +++ b/core/inc/khronos/openmax/include/OMX_IntelVideoExt.h @@ -63,6 +63,9 @@ typedef struct OMX_VIDEO_CONFIG_INTEL_BITRATETYPE { OMX_U32 nWindowSize; // Window size in milliseconds allowed for bitrate to reach target OMX_U32 nInitialQP; // Initial QP for I frames OMX_U32 nMinQP; + OMX_U32 nMaxQP; + OMX_U32 nFrameRate; + OMX_U32 nTemporalID; } OMX_VIDEO_CONFIG_INTEL_BITRATETYPE; typedef enum OMX_VIDEO_INTEL_CONTROLRATETYPE { @@ -197,22 +200,13 @@ typedef struct OMX_VIDEO_CONFIG_INTEL_VP8_MAX_FRAME_SIZE_RATIO { } OMX_VIDEO_CONFIG_INTEL_VP8_MAX_FRAME_SIZE_RATIO; // number of temporal layer for WebRTC and Sand -typedef struct OMX_VIDEO_PARAM_INTEL_VP8_NUMBER_OF_TEMPORAL_LAYER { +typedef struct OMX_VIDEO_PARAM_INTEL_NUMBER_OF_TEMPORAL_LAYER { OMX_U32 nSize; OMX_VERSIONTYPE nVersion; OMX_U32 nPortIndex; OMX_U32 nNumberOfTemporalLayer; -} OMX_VIDEO_PARAM_INTEL_VP8_NUMBER_OF_TEMPORAL_LAYER; +} OMX_VIDEO_PARAM_INTEL_NUMBER_OF_TEMPORAL_LAYER; -// Layer and Bitrate Framerate data paires for SAND VP8 encode -typedef struct OMX_VIDEO_CONFIG_INTEL_VP8_TEMPORAL_LAYER_BITRATE_FRAMERATE { - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; - OMX_U32 nPortIndex; - OMX_U32 nLayerID; - OMX_U32 nBitrate; - OMX_U32 nFramerate; -} OMX_VIDEO_CONFIG_INTEL_VP8_TEMPORAL_LAYER_BITRATE_FRAMERATE; #ifdef __cplusplus } |