diff options
| author | bolunliu <bolun.liu@intel.com> | 2014-05-09 13:53:28 +0800 |
|---|---|---|
| committer | Patrick Tjin <pattjin@google.com> | 2014-07-21 22:03:43 -0700 |
| commit | bc093e3ecfb9386e27a1501188176966a2f609b1 (patch) | |
| tree | 5364867083cbe86ffe956fa134f1242a313b37f3 | |
| parent | e3e491f0eb8ddb06c941fcf0b980ab0edb78b089 (diff) | |
| download | wrs_omxil_core-bc093e3ecfb9386e27a1501188176966a2f609b1.tar.gz | |
[PORT FROM MAIN]Port VP8 encode middleware to R44c branch.
BZ: 193452
Port VP8 encode OMX Core to R44c branch.
Signed-off-by: bolunliu <bolun.liu@intel.com>
Change-Id: I742440ff9a01c4061b7f8046ffa9445c104867e1
| -rw-r--r-- | base/src/componentbase.cpp | 8 | ||||
| -rw-r--r-- | core/inc/khronos/openmax/include/OMX_IntelIndexExt.h | 3 |
2 files changed, 3 insertions, 8 deletions
diff --git a/base/src/componentbase.cpp b/base/src/componentbase.cpp index 14318a0..a1e861f 100644 --- a/base/src/componentbase.cpp +++ b/base/src/componentbase.cpp @@ -830,10 +830,6 @@ OMX_ERRORTYPE ComponentBase::CBaseGetExtensionIndex( return OMX_ErrorNone; } - if (!strcmp(cParameterName, "OMX.Intel.index.vp8ForceKFrame")) { - *pIndexType = static_cast<OMX_INDEXTYPE>(OMX_IndexExtVP8ForceKFrame); - return OMX_ErrorNone; - } if (!strcmp(cParameterName, "OMX.Intel.index.requestBlackFramePointer")) { *pIndexType = static_cast<OMX_INDEXTYPE>(OMX_IndexExtRequestBlackFramePointer); return OMX_ErrorNone; @@ -844,8 +840,8 @@ OMX_ERRORTYPE ComponentBase::CBaseGetExtensionIndex( return OMX_ErrorNone; } - if (!strcmp(cParameterName, "OMX.Intel.index.numberOfTemporalLayer")) { - *pIndexType = static_cast<OMX_INDEXTYPE>(OMX_IndexExtNumberOfTemporalLayer); + if (!strcmp(cParameterName, "OMX.Intel.index.temporalLayer")) { + *pIndexType = static_cast<OMX_INDEXTYPE>(OMX_IndexExtTemporalLayer); return OMX_ErrorNone; } diff --git a/core/inc/khronos/openmax/include/OMX_IntelIndexExt.h b/core/inc/khronos/openmax/include/OMX_IntelIndexExt.h index 4bdf6a7..1914662 100644 --- a/core/inc/khronos/openmax/include/OMX_IntelIndexExt.h +++ b/core/inc/khronos/openmax/include/OMX_IntelIndexExt.h @@ -66,9 +66,8 @@ typedef enum OMX_INTELINDEXEXTTYPE { /* Error report by WebRTC */ OMX_IndexExtEnableErrorReport, /**<reference: EnableErrorReport for decoder */ OMX_IndexExtPrepareForAdaptivePlayback, /**<reference: Prepare for AdaptivePlayback*/ - OMX_IndexExtVP8ForceKFrame, /**<reference: For VP8 Force K Frame*/ OMX_IndexExtVP8MaxFrameSizeRatio, /**<reference: For VP8 Max Frame Size*/ - OMX_IndexExtNumberOfTemporalLayer, /**<reference: For Number of Layer*/ + OMX_IndexExtTemporalLayer, /**<reference: For Temporal Layer*/ OMX_IndexExtRequestBlackFramePointer, /**<reference: OMX_VIDEO_INTEL_REQUEST_BALCK_FRAME_POINTER*/ // Index for VPP must always be put at the end |