commit a6ebfeb41f53933b4a4882aab2b625b74204527d
author Xigui Wang <xigui.wang@intel.com> Fri Nov 14 22:13:09 2014 +0800
committer Pat Tjin <pattjin@google.com> Tue Dec 02 21:49:45 2014 +0000
tree 08070e21c34bb671098ba6159da9105c70fab5f0
parent c75124d4c9d14ad647748a7ff216567f184f150e

enable OMX extension OMX_IndexExtVppBufferNum for ISV

change TARGET_HAS_VPP to TARGET_HAS_ISV

BZ: 229811
Bug: 17383204

Change-Id: I700674221d05e9205127fe1ef7805ccf16c5d208
Signed-off-by: Jason Hu <jason.hu@intel.com>

videodecoder/Android.mk

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 @@
 
 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 := \

videodecoder/VideoDecoderBase.cpp

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 @@
 
     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)

videodecoder/VideoDecoderDefs.h

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 @@
     VideoExtensionBuffer *ext;
     void* nativeWindow;
     uint32_t rotationDegrees;
-#ifdef TARGET_HAS_VPP
+#ifdef TARGET_HAS_ISV
     uint32_t vppBufferNum;
 #endif
 };