commit 83bb27286e32a809f4cead6d4e81fd5305d426f1
author Fei Jiang <fei.jiang@intel.com> Wed Apr 17 02:15:31 2013 +0800
committer Patrick Tjin <pattjin@google.com> Mon Jul 21 21:51:36 2014 -0700
tree 14799fda46fcf33f46c4eb15a36ff59d014c613f
parent d0101a261d44ae3f4cad1f02410ff1a80ddb9112

Load different video drivers according to video codecs

BZ: 98522

On the baytrail platform, there are two video decoder hardwares.
The Intel GEN will handle H264 and VC1 decode and VXD will
handle MPEG4, H263 and VP8 decode. GEN uses i965 driver and
VxD uses pvr driver. We have to load different drivers according
to the codec type of the video.

Use setenv before vaInitialize and unsetenv after it can work.
But there is one problem for thumbnail generation case,
multiple threads will call setenv/unsetenv. One thread just call set
env to pvr, but another thread maybe call set env to i915,
which will lead to previous thread didn't load correct library.

The solution here is to pass driver name through vaDisplay
in function vaGetDisplay, change vaDisplay from type unsigned int
to char * and set driver name to vaDisplay.
Take pvr_drv_video for example, need set vaDisplay=
"libva_driver_name=pvr".

Change-Id: I671fb8817e2f76eb8f4baaf8d63cdbc75ba90f77
Signed-off-by: Fei Jiang <fei.jiang@intel.com>
Reviewed-on: http://android.intel.com:8080/102308
Reviewed-by: Shi, PingX <pingx.shi@intel.com>
Tested-by: Shi, PingX <pingx.shi@intel.com>
Reviewed-by: buildbot <buildbot@intel.com>
Tested-by: buildbot <buildbot@intel.com>

videodecoder/VideoDecoderBase.cpp

diff --git a/videodecoder/VideoDecoderBase.cpp b/videodecoder/VideoDecoderBase.cpp
index bd9ffd4..b1e9541 100755
--- a/videodecoder/VideoDecoderBase.cpp
+++ b/videodecoder/VideoDecoderBase.cpp
@@ -739,29 +739,29 @@
     }
 
     // Display is defined as "unsigned int"
-
+#ifndef LOAD_PVR_DRIVER
     mDisplay = new Display;
     *mDisplay = ANDROID_DISPLAY_HANDLE;
-
+#else
+    if (profile >= VAProfileH264Baseline && profile <= VAProfileVC1Advanced) {
+        ITRACE("Using GEN driver");
+        mDisplay = "libva_driver_name=i965";
+    }
+    else {
+        ITRACE("Using PVR driver");
+        mDisplay = "libva_driver_name=pvr";
+    }
+#endif
     mVADisplay = vaGetDisplay(mDisplay);
     if (mVADisplay == NULL) {
         ETRACE("vaGetDisplay failed.");
         return DECODE_DRIVER_FAIL;
     }
 
-#ifdef LOAD_PVR_DRIVER
-    ITRACE("load pvr driver.\n");
-    setenv("LIBVA_DRIVER_NAME", "pvr", 1);
-#endif
-
     int majorVersion, minorVersion;
     vaStatus = vaInitialize(mVADisplay, &majorVersion, &minorVersion);
     CHECK_VA_STATUS("vaInitialize");
 
-#ifdef LOAD_PVR_DRIVER
-    unsetenv("LIBVA_DRIVER_NAME");
-#endif
-
     if (mConfigBuffer.frameRate > 45 && mVideoFormatInfo.height >= 1080) {
         // ugly workaround here
         // for fps > 45 and height > 1080, we will force to
@@ -943,7 +943,9 @@
     }
 
     if (mDisplay) {
+#ifndef LOAD_PVR_DRIVER
         delete mDisplay;
+#endif
         mDisplay = NULL;
     }
 

videodecoder/VideoDecoderBase.h

diff --git a/videodecoder/VideoDecoderBase.h b/videodecoder/VideoDecoderBase.h
index 048da3c..a1ad265 100644
--- a/videodecoder/VideoDecoderBase.h
+++ b/videodecoder/VideoDecoderBase.h
@@ -37,8 +37,12 @@
 }
 
 #ifndef Display
+#ifdef LOAD_PVR_DRIVER
+typedef char Display;
+#else
 typedef unsigned int Display;
 #endif
+#endif
 
 // TODO: check what is the best number. Must be at least 2 to support one backward reference frame.
 // Currently set to 8 to support 7 backward reference frames. This value is used for AVC frame reordering only.