WA for VPP linux compiling error

WA for VPP linux compiling error

Change-Id: Ibf5363ac15abdbdf2705363ea7d7913ab26d231a
Tracked-On: None
Signed-off-by: Shaofeng Tang <shaofeng.tang@intel.com>

Author: Shao-Feng

Android.common.mk

@@ -151,7 +151,9 @@ LOCAL_C_INCLUDES += \
 LOCAL_SHARED_LIBRARIES += \
 	libva \
 	libva-android
-LOCAL_CPPFLAGS += -DVA_WITH_PAVP
+LOCAL_CPPFLAGS += \
+	-DVA_WITH_PAVP \
+        -DVA_WITH_VPP
 else
 LOCAL_CPPFLAGS += -DDISABLE_VA
 endif

common/Android.mk

@@ -101,7 +101,9 @@ LOCAL_C_INCLUDES += $(TARGET_OUT_HEADERS)/libva
 LOCAL_SRC_FILES += compositor/va/varenderer.cpp \
 	           compositor/va/vautils.cpp
 
-LOCAL_CPPFLAGS += -DVA_WITH_PAVP
+LOCAL_CPPFLAGS += \
+	-DVA_WITH_PAVP \
+	-DVA_WITH_VPP
 else
 LOCAL_CPPFLAGS += -DDISABLE_VA
 endif

common/compositor/va/varenderer.cpp

@@ -310,9 +310,6 @@ bool VARenderer::Draw(const MediaState& state, NativeSurface* surface) {
     output_region.width = layer_in->GetDisplayFrameWidth();
     output_region.height = layer_in->GetDisplayFrameHeight();
 
-    VABlendState bs = {};
-    bs.flags = VA_BLEND_PREMULTIPLIED_ALPHA;
-
     VAProcPipelineParameterBuffer pipe_param = {};
     pipe_param.surface = surface_in;
     pipe_param.surface_region = &surface_region;
@@ -332,7 +329,11 @@ bool VARenderer::Draw(const MediaState& state, NativeSurface* surface) {
     }
 #endif
 
+#ifdef VA_WITH_VPP
+    VABlendState bs = {};
+    bs.flags = VA_BLEND_PREMULTIPLIED_ALPHA;
     pipe_param.blend_state = &bs;
+#endif
 
     DUMPTRACE("surface_region: (%d, %d, %d, %d)\n", surface_region.x,
               surface_region.y, surface_region.width, surface_region.height);