From 6b334fd4175f234d24739f75330c50549fb6bed0 Mon Sep 17 00:00:00 2001 From: bolunliu Date: Fri, 9 May 2014 13:57:33 +0800 Subject: [PORT FROM MAIN]Port VP8 encode middleware to R44c branch. BZ: 193452 Port VP8 encode OMX IL to R44c branch. Signed-off-by: bolunliu Change-Id: I04c59a60c5d8c1e50ed452bd91ce6225d4bfc74e --- videocodec/OMXVideoEncoderVP8.cpp | 36 ++++-------------------------------- 1 file changed, 4 insertions(+), 32 deletions(-) (limited to 'videocodec/OMXVideoEncoderVP8.cpp') diff --git a/videocodec/OMXVideoEncoderVP8.cpp b/videocodec/OMXVideoEncoderVP8.cpp index d952913..67bbfb5 100644 --- a/videocodec/OMXVideoEncoderVP8.cpp +++ b/videocodec/OMXVideoEncoderVP8.cpp @@ -40,10 +40,10 @@ OMX_ERRORTYPE OMXVideoEncoderVP8::InitOutputPortFormatSpecific(OMX_PARAM_PORTDEF paramPortDefinitionOutput->format.video.eCompressionFormat = OMX_VIDEO_CodingVP8; // OMX_VIDEO_PARAM_INTEL_NUMBER_OF_TEMPORAL_LAYER - memset(&mNumberOfTemporalLayer, 0, sizeof(mNumberOfTemporalLayer)); - SetTypeHeader(&mNumberOfTemporalLayer, sizeof(mNumberOfTemporalLayer)); - mNumberOfTemporalLayer.nPortIndex = OUTPORT_INDEX; - mNumberOfTemporalLayer.nNumberOfTemporalLayer = 1;//default value is 1 + memset(&mTemporalLayer, 0, sizeof(mTemporalLayer)); + SetTypeHeader(&mTemporalLayer, sizeof(mTemporalLayer)); + mTemporalLayer.nPortIndex = OUTPORT_INDEX; + mTemporalLayer.nNumberOfTemporalLayer = 1;//default value is 1 mParamProfileLevel.eProfile = OMX_VIDEO_VP8ProfileMain; mParamProfileLevel.eLevel = OMX_VIDEO_VP8Level_Version3; @@ -208,7 +208,6 @@ OMX_ERRORTYPE OMXVideoEncoderVP8::BuildHandlerList(void) { OMXVideoEncoderBase::BuildHandlerList(); AddHandler((OMX_INDEXTYPE)OMX_IndexParamVideoVp8, GetParamVideoVp8, SetParamVideoVp8); AddHandler((OMX_INDEXTYPE)OMX_IndexConfigVideoVp8ReferenceFrame, GetConfigVideoVp8ReferenceFrame, SetConfigVideoVp8ReferenceFrame); - AddHandler((OMX_INDEXTYPE)OMX_IndexExtVP8ForceKFrame, GetConfigVp8ForceKFrame, SetConfigVp8ForceKFrame); AddHandler((OMX_INDEXTYPE)OMX_IndexExtVP8MaxFrameSizeRatio, GetConfigVp8MaxFrameSizeRatio, SetConfigVp8MaxFrameSizeRatio); return OMX_ErrorNone; @@ -270,33 +269,6 @@ OMX_ERRORTYPE OMXVideoEncoderVP8::SetConfigVideoVp8ReferenceFrame(OMX_PTR pStruc return OMX_ErrorNone; } -OMX_ERRORTYPE OMXVideoEncoderVP8::GetConfigVp8ForceKFrame(OMX_PTR pStructure) { - - return OMX_ErrorNone; -} - -OMX_ERRORTYPE OMXVideoEncoderVP8::SetConfigVp8ForceKFrame(OMX_PTR pStructure) { - OMX_ERRORTYPE ret; - Encode_Status retStatus = ENCODE_SUCCESS; - OMX_VIDEO_CONFIG_INTEL_VP8_FORCE_KFRAME *p = (OMX_VIDEO_CONFIG_INTEL_VP8_FORCE_KFRAME*) pStructure; - CHECK_TYPE_HEADER(p); - CHECK_PORT_INDEX(p, OUTPORT_INDEX); - - CHECK_SET_CONFIG_STATE(); - - VideoConfigVP8 configVP8; - configVP8.force_kf = p->bForceKFrame; - configVP8.refresh_entropy_probs = 0; - configVP8.value = 0; - configVP8.sharpness_level = 2; - - retStatus = mVideoEncoder->setConfig(&configVP8); - if(retStatus != ENCODE_SUCCESS) { - LOGW("Failed to set vp8 force frame"); - } - return OMX_ErrorNone; -} - OMX_ERRORTYPE OMXVideoEncoderVP8::GetConfigVp8MaxFrameSizeRatio(OMX_PTR pStructure) { return OMX_ErrorNone; -- cgit v1.2.3