commit ba711c4a2bc6fbc12544c7eaef8329cd0e6cc75d
author wfeng6 <wei.feng@intel.com> Fri Dec 27 16:01:10 2013 +0800
committer Patrick Tjin <pattjin@google.com> Mon Jul 21 21:51:47 2014 -0700
tree 9f426e2894c58f7a071c5d2e23ef84bc74aa4c41
parent 6fd0eeb4a56191933455c8f8e9a5cfa06963c9bc

Only load i965 driver on the CHT platform

BZ: 161384

The hybrid driver loading is only needed on the BYT platform, which
has both VED and GEN hardware. On the CTH platform, there is only
GEN hardware. So for VP8 decoding, we need to use i965 driver
instead of psb driver

Change-Id: I6731c7bd7c190ee9bb373ff7be4719320e02dee7
Signed-off-by: wfeng6 <wei.feng@intel.com>

videodecoder/Android.mk

diff --git a/videodecoder/Android.mk b/videodecoder/Android.mk
index 32a1851..32abd4e 100644
--- a/videodecoder/Android.mk
+++ b/videodecoder/Android.mk
@@ -34,6 +34,12 @@
     LOCAL_CFLAGS += -DUSE_AVC_SHORT_FORMAT -DUSE_GEN_HW
 endif
 
+PLATFORM_USE_HYBRID_DRIVER := \
+    baytrail
+
+ifneq ($(filter $(TARGET_BOARD_PLATFORM),$(PLATFORM_USE_HYBRID_DRIVER)),)
+    LOCAL_CFLAGS += -DUSE_HYBRID_DRIVER
+endif
 
 #LOCAL_LDLIBS += -lpthread
 

videodecoder/VideoDecoderBase.cpp

diff --git a/videodecoder/VideoDecoderBase.cpp b/videodecoder/VideoDecoderBase.cpp
index cb6a663..5424784 100644
--- a/videodecoder/VideoDecoderBase.cpp
+++ b/videodecoder/VideoDecoderBase.cpp
@@ -763,7 +763,7 @@
     }
 
     // Display is defined as "unsigned int"
-#ifndef USE_GEN_HW
+#ifndef USE_HYBRID_DRIVER
     mDisplay = new Display;
     *mDisplay = ANDROID_DISPLAY_HANDLE;
 #else
@@ -995,7 +995,7 @@
     }
 
     if (mDisplay) {
-#ifndef USE_GEN_HW
+#ifndef USE_HYBRID_DRIVER
         delete mDisplay;
 #endif
         mDisplay = NULL;