aboutsummaryrefslogtreecommitdiffstats
path: root/videocodec
diff options
context:
space:
mode:
authorbolunliu <bolun.liu@intel.com>2014-04-04 10:12:52 +0800
committerPatrick Tjin <pattjin@google.com>2014-07-21 22:02:58 -0700
commit92d8196604e8dca16fb6cc73e4b6660db7ec3731 (patch)
tree6deb5e49f7c0ef7e7e8628d0226c885490eb905d /videocodec
parentf0261dd0810ccec17b536f213c12aad31bcc610e (diff)
downloadandroid_hardware_intel_common_omx-components-92d8196604e8dca16fb6cc73e4b6660db7ec3731.tar.gz
android_hardware_intel_common_omx-components-92d8196604e8dca16fb6cc73e4b6660db7ec3731.tar.bz2
android_hardware_intel_common_omx-components-92d8196604e8dca16fb6cc73e4b6660db7ec3731.zip
Rename temporal layer name for SAND
BZ: 185262 Rename temporal layer name for SAND. Rename it as "OMX_VIDEO_PARAM_INTEL_TEMPORAL_LAYER" Fix OMX IL compile issue. Change-Id: Iff69e241425866d0ea3086dd0d87e9225e60684d Signed-off-by: bolunliu <bolun.liu@intel.com>
Diffstat (limited to 'videocodec')
-rw-r--r--[-rwxr-xr-x]videocodec/OMXVideoEncoderBase.cpp4
-rw-r--r--videocodec/OMXVideoEncoderBase.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/videocodec/OMXVideoEncoderBase.cpp b/videocodec/OMXVideoEncoderBase.cpp
index 1629b0d..89eb10a 100755..100644
--- a/videocodec/OMXVideoEncoderBase.cpp
+++ b/videocodec/OMXVideoEncoderBase.cpp
@@ -872,7 +872,7 @@ OMX_ERRORTYPE OMXVideoEncoderBase::SetPrependSPSPPS(OMX_PTR pStructure) {
OMX_ERRORTYPE OMXVideoEncoderBase::GetTemporalLayerNumber(OMX_PTR pStructure) {
OMX_ERRORTYPE ret;
- OMX_VIDEO_PARAM_INTEL_NUMBER_OF_TEMPORAL_LAYER* p = static_cast<OMX_VIDEO_PARAM_INTEL_NUMBER_OF_TEMPORAL_LAYER*>(pStructure);
+ OMX_VIDEO_PARAM_INTEL_TEMPORAL_LAYER* p = static_cast<OMX_VIDEO_PARAM_INTEL_TEMPORAL_LAYER*>(pStructure);
CHECK_TYPE_HEADER(p);
CHECK_PORT_INDEX(p, OUTPORT_INDEX);
@@ -882,7 +882,7 @@ OMX_ERRORTYPE OMXVideoEncoderBase::GetTemporalLayerNumber(OMX_PTR pStructure) {
OMX_ERRORTYPE OMXVideoEncoderBase::SetTemporalLayerNumber(OMX_PTR pStructure) {
OMX_ERRORTYPE ret;
- OMX_VIDEO_PARAM_INTEL_NUMBER_OF_TEMPORAL_LAYER *p = (OMX_VIDEO_PARAM_INTEL_NUMBER_OF_TEMPORAL_LAYER *)pStructure;
+ OMX_VIDEO_PARAM_INTEL_TEMPORAL_LAYER *p = (OMX_VIDEO_PARAM_INTEL_TEMPORAL_LAYER *)pStructure;
VideoParamsTemporalLayerNumber TemporalLayerNumber;
CHECK_TYPE_HEADER(p);
diff --git a/videocodec/OMXVideoEncoderBase.h b/videocodec/OMXVideoEncoderBase.h
index b6580d9..790e91f 100644
--- a/videocodec/OMXVideoEncoderBase.h
+++ b/videocodec/OMXVideoEncoderBase.h
@@ -83,7 +83,7 @@ protected:
OMX_CONFIG_FRAMERATETYPE mConfigFramerate;
OMX_VIDEO_PARAM_INTEL_ADAPTIVE_SLICE_CONTROL mParamIntelAdaptiveSliceControl;
OMX_VIDEO_PARAM_PROFILELEVELTYPE mParamProfileLevel;
- OMX_VIDEO_PARAM_INTEL_NUMBER_OF_TEMPORAL_LAYER mNumberOfTemporalLayer;
+ OMX_VIDEO_PARAM_INTEL_TEMPORAL_LAYER mNumberOfTemporalLayer;
IVideoEncoder *mVideoEncoder;
VideoParamsCommon *mEncoderParams;