diff options
| author | Xigui Wang <xigui.wang@intel.com> | 2014-12-03 00:30:09 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-03 00:30:09 +0000 |
| commit | bf62564a2a39a9bfb439e7919c7cc1b5ad1b2832 (patch) | |
| tree | 3ca7f8b2b05a2ee1cef5c8f131ea0490d9b6e9c0 | |
| parent | 3fb7484b5c005245424feb2da6b5a574955e4b02 (diff) | |
| parent | d4d49639f15e5f2791e806556332df872d5c672f (diff) | |
| download | libmix-bf62564a2a39a9bfb439e7919c7cc1b5ad1b2832.tar.gz | |
am d4d49639: am a6ebfeb4: enable OMX extension OMX_IndexExtVppBufferNum for ISV
* commit 'd4d49639f15e5f2791e806556332df872d5c672f':
enable OMX extension OMX_IndexExtVppBufferNum for ISV
| -rw-r--r-- | videodecoder/Android.mk | 4 | ||||
| -rw-r--r-- | videodecoder/VideoDecoderBase.cpp | 2 | ||||
| -rw-r--r-- | videodecoder/VideoDecoderDefs.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/videodecoder/Android.mk b/videodecoder/Android.mk index 53e3283..d3ff4f2 100644 --- a/videodecoder/Android.mk +++ b/videodecoder/Android.mk @@ -2,8 +2,8 @@ LOCAL_PATH := $(call my-dir) 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_SRC_FILES := \ diff --git a/videodecoder/VideoDecoderBase.cpp b/videodecoder/VideoDecoderBase.cpp index 1065cd4..8c66e80 100644 --- a/videodecoder/VideoDecoderBase.cpp +++ b/videodecoder/VideoDecoderBase.cpp @@ -775,7 +775,7 @@ Decode_Status VideoDecoderBase::setupVA(uint32_t numSurface, VAProfile profile, mRotationDegrees = 0; if (mConfigBuffer.flag & USE_NATIVE_GRAPHIC_BUFFER){ -#ifdef TARGET_HAS_VPP +#ifdef TARGET_HAS_ISV if (mVideoFormatInfo.actualBufferNeeded > mConfigBuffer.surfaceNumber - mConfigBuffer.vppBufferNum) #else if (mVideoFormatInfo.actualBufferNeeded > mConfigBuffer.surfaceNumber) diff --git a/videodecoder/VideoDecoderDefs.h b/videodecoder/VideoDecoderDefs.h index c9b5d30..708725b 100644 --- a/videodecoder/VideoDecoderDefs.h +++ b/videodecoder/VideoDecoderDefs.h @@ -153,7 +153,7 @@ struct VideoConfigBuffer { VideoExtensionBuffer *ext; void* nativeWindow; uint32_t rotationDegrees; -#ifdef TARGET_HAS_VPP +#ifdef TARGET_HAS_ISV uint32_t vppBufferNum; #endif }; |