From 3fcd3fa146cff6a9efeee3ce11315fce2e3834eb Mon Sep 17 00:00:00 2001 From: Xigui Wang Date: Fri, 14 Nov 2014 22:11:30 +0800 Subject: enable OMX extension OMX_IndexExtVppBufferNum for ISV change TARGET_HAS_VPP to TARGET_HAS_ISV BZ: 229811 Bug: 17383204 Change-Id: I9a7212f1e51ed686f734635c5db581e2b448ef70 Signed-off-by: Jason Hu --- videocodec/Android.mk | 48 +++++++++++++++++++------------------- videocodec/OMXVideoDecoderBase.cpp | 18 +++++++------- videocodec/OMXVideoDecoderBase.h | 4 ++-- 3 files changed, 35 insertions(+), 35 deletions(-) (limited to 'videocodec') diff --git a/videocodec/Android.mk b/videocodec/Android.mk index 8820eac..d3b3366 100644 --- a/videocodec/Android.mk +++ b/videocodec/Android.mk @@ -9,8 +9,8 @@ endif include $(CLEAR_VARS) -ifeq ($(TARGET_HAS_VPP),true) -LOCAL_CFLAGS += -DTARGET_HAS_VPP +ifeq ($(TARGET_HAS_ISV),true) +LOCAL_CFLAGS += -DTARGET_HAS_ISV endif LOCAL_SHARED_LIBRARIES := \ @@ -79,8 +79,8 @@ PLATFORM_SUPPORT_VP8 := \ ifneq ($(filter $(TARGET_BOARD_PLATFORM),$(PLATFORM_SUPPORT_VP8)),) include $(CLEAR_VARS) -ifeq ($(TARGET_HAS_VPP),true) -LOCAL_CFLAGS += -DTARGET_HAS_VPP +ifeq ($(TARGET_HAS_ISV),true) +LOCAL_CFLAGS += -DTARGET_HAS_ISV endif LOCAL_SHARED_LIBRARIES := \ @@ -140,8 +140,8 @@ endif # VP9 with SW decode and HW Render include $(CLEAR_VARS) -ifeq ($(TARGET_HAS_VPP),true) -LOCAL_CFLAGS += -DTARGET_HAS_VPP +ifeq ($(TARGET_HAS_ISV),true) +LOCAL_CFLAGS += -DTARGET_HAS_ISV endif LOCAL_SHARED_LIBRARIES := \ @@ -242,8 +242,8 @@ include $(BUILD_SHARED_LIBRARY) endif include $(CLEAR_VARS) -ifeq ($(TARGET_HAS_VPP),true) -LOCAL_CFLAGS += -DTARGET_HAS_VPP +ifeq ($(TARGET_HAS_ISV),true) +LOCAL_CFLAGS += -DTARGET_HAS_ISV endif LOCAL_SHARED_LIBRARIES := \ @@ -299,8 +299,8 @@ include $(BUILD_SHARED_LIBRARY) ################################################################################ include $(CLEAR_VARS) -ifeq ($(TARGET_HAS_VPP),true) -LOCAL_CFLAGS += -DTARGET_HAS_VPP +ifeq ($(TARGET_HAS_ISV),true) +LOCAL_CFLAGS += -DTARGET_HAS_ISV endif LOCAL_SHARED_LIBRARIES := \ @@ -356,8 +356,8 @@ include $(BUILD_SHARED_LIBRARY) ################################################################################ include $(CLEAR_VARS) -ifeq ($(TARGET_HAS_VPP),true) -LOCAL_CFLAGS += -DTARGET_HAS_VPP +ifeq ($(TARGET_HAS_ISV),true) +LOCAL_CFLAGS += -DTARGET_HAS_ISV endif LOCAL_SHARED_LIBRARIES := \ @@ -420,8 +420,8 @@ include $(BUILD_SHARED_LIBRARY) ifeq ($(USE_INTEL_SECURE_AVC),true) include $(CLEAR_VARS) -ifeq ($(TARGET_HAS_VPP),true) -LOCAL_CFLAGS += -DTARGET_HAS_VPP +ifeq ($(TARGET_HAS_ISV),true) +LOCAL_CFLAGS += -DTARGET_HAS_ISV endif LOCAL_SHARED_LIBRARIES := \ @@ -465,8 +465,8 @@ endif #USE_INTEL_SECURE_AVC ################################################################################ include $(CLEAR_VARS) -ifeq ($(TARGET_HAS_VPP),true) -LOCAL_CFLAGS += -DTARGET_HAS_VPP +ifeq ($(TARGET_HAS_ISV),true) +LOCAL_CFLAGS += -DTARGET_HAS_ISV endif LOCAL_SHARED_LIBRARIES := \ @@ -503,8 +503,8 @@ include $(BUILD_SHARED_LIBRARY) ################################################################################ include $(CLEAR_VARS) -ifeq ($(TARGET_HAS_VPP),true) -LOCAL_CFLAGS += -DTARGET_HAS_VPP +ifeq ($(TARGET_HAS_ISV),true) +LOCAL_CFLAGS += -DTARGET_HAS_ISV endif LOCAL_SHARED_LIBRARIES := \ @@ -545,8 +545,8 @@ include $(BUILD_SHARED_LIBRARY) ################################################################################ include $(CLEAR_VARS) -ifeq ($(TARGET_HAS_VPP),true) -LOCAL_CFLAGS += -DTARGET_HAS_VPP +ifeq ($(TARGET_HAS_ISV),true) +LOCAL_CFLAGS += -DTARGET_HAS_ISV endif LOCAL_SHARED_LIBRARIES := \ @@ -584,8 +584,8 @@ include $(BUILD_SHARED_LIBRARY) ################################################################################ include $(CLEAR_VARS) -ifeq ($(TARGET_HAS_VPP),true) -LOCAL_CFLAGS += -DTARGET_HAS_VPP +ifeq ($(TARGET_HAS_ISV),true) +LOCAL_CFLAGS += -DTARGET_HAS_ISV endif LOCAL_SHARED_LIBRARIES := \ @@ -629,8 +629,8 @@ include $(BUILD_SHARED_LIBRARY) ################################################################################ include $(CLEAR_VARS) -ifeq ($(TARGET_HAS_VPP),true) -LOCAL_CFLAGS += -DTARGET_HAS_VPP +ifeq ($(TARGET_HAS_ISV),true) +LOCAL_CFLAGS += -DTARGET_HAS_ISV endif LOCAL_SHARED_LIBRARIES := \ diff --git a/videocodec/OMXVideoDecoderBase.cpp b/videocodec/OMXVideoDecoderBase.cpp index e363b45..cbbc9ae 100644 --- a/videocodec/OMXVideoDecoderBase.cpp +++ b/videocodec/OMXVideoDecoderBase.cpp @@ -28,11 +28,11 @@ static const uint32_t VA_COLOR_FORMAT = 0x7FA00E00; OMXVideoDecoderBase::OMXVideoDecoderBase() : mRotationDegrees(0), - mVideoDecoder(NULL), - mNativeBufferCount(OUTPORT_NATIVE_BUFFER_COUNT), -#ifdef TARGET_HAS_VPP +#ifdef TARGET_HAS_ISV mVppBufferNum(0), #endif + mVideoDecoder(NULL), + mNativeBufferCount(OUTPORT_NATIVE_BUFFER_COUNT), mWorkingMode(RAWDATA_MODE), mErrorReportEnabled (false) { mOMXBufferHeaderTypePtrNum = 0; @@ -222,7 +222,7 @@ OMX_ERRORTYPE OMXVideoDecoderBase::ProcessorDeinit(void) { mOMXBufferHeaderTypePtrNum = 0; memset(&mGraphicBufferParam, 0, sizeof(mGraphicBufferParam)); mRotationDegrees = 0; -#ifdef TARGET_HAS_VPP +#ifdef TARGET_HAS_ISV mVppBufferNum = 0; #endif return OMXComponentCodecBase::ProcessorDeinit(); @@ -477,7 +477,7 @@ OMX_ERRORTYPE OMXVideoDecoderBase::PrepareConfigBuffer(VideoConfigBuffer *p) { } p->rotationDegrees = mRotationDegrees; -#ifdef TARGET_HAS_VPP +#ifdef TARGET_HAS_ISV p->vppBufferNum = mVppBufferNum; #endif p->width = paramPortDefinitionInput->format.video.nFrameWidth; @@ -635,7 +635,7 @@ OMX_ERRORTYPE OMXVideoDecoderBase::HandleFormatChange(void) { uint32_t sliceHeightCropped = heightCropped; int force_realloc = 0; -#ifdef TARGET_HAS_VPP +#ifdef TARGET_HAS_ISV LOGI("============== mVppBufferNum = %d\n", mVppBufferNum); if (paramPortDefinitionOutput.nBufferCountActual - mVppBufferNum < formatInfo->actualBufferNeeded) { #else @@ -764,7 +764,7 @@ OMX_ERRORTYPE OMXVideoDecoderBase::BuildHandlerList(void) { AddHandler(static_cast(OMX_IndexExtUseNativeBuffer), GetNativeBuffer, SetNativeBuffer); AddHandler(static_cast(OMX_IndexExtEnableNativeBuffer), GetNativeBufferMode, SetNativeBufferMode); AddHandler(static_cast(OMX_IndexExtRotationDegrees), GetDecoderRotation, SetDecoderRotation); -#ifdef TARGET_HAS_VPP +#ifdef TARGET_HAS_ISV AddHandler(static_cast(OMX_IndexExtVppBufferNum), GetDecoderVppBufferNum, SetDecoderVppBufferNum); #endif AddHandler(OMX_IndexConfigCommonOutputCrop, GetDecoderOutputCrop, SetDecoderOutputCrop); @@ -919,8 +919,8 @@ OMX_ERRORTYPE OMXVideoDecoderBase::SetDecoderRotation(OMX_PTR pStructure) { } } -#ifdef TARGET_HAS_VPP -OMX_ERRORTYPE OMXVideoDecoderBase::GetDecoderVppBufferNum(OMX_PTR pStructure) { +#ifdef TARGET_HAS_ISV +OMX_ERRORTYPE OMXVideoDecoderBase::GetDecoderVppBufferNum(OMX_PTR) { return OMX_ErrorBadParameter; } OMX_ERRORTYPE OMXVideoDecoderBase::SetDecoderVppBufferNum(OMX_PTR pStructure) { diff --git a/videocodec/OMXVideoDecoderBase.h b/videocodec/OMXVideoDecoderBase.h index 556bc23..49610a7 100644 --- a/videocodec/OMXVideoDecoderBase.h +++ b/videocodec/OMXVideoDecoderBase.h @@ -80,7 +80,7 @@ protected: DECLARE_HANDLER(OMXVideoDecoderBase, NativeBufferMode); DECLARE_HANDLER(OMXVideoDecoderBase, DecoderRotation); DECLARE_HANDLER(OMXVideoDecoderBase, DecoderOutputCrop); -#ifdef TARGET_HAS_VPP +#ifdef TARGET_HAS_ISV DECLARE_HANDLER(OMXVideoDecoderBase, DecoderVppBufferNum); #endif DECLARE_HANDLER(OMXVideoDecoderBase, ErrorReportMode); @@ -107,7 +107,7 @@ private: uint32_t graphicBufferColorFormat; }; uint32_t mRotationDegrees; -#ifdef TARGET_HAS_VPP +#ifdef TARGET_HAS_ISV uint32_t mVppBufferNum; #endif -- cgit v1.2.3