VAVDA: Go back to using vaTerminate now that the bug in the driver is fixed.

https://gerrit.chromium.org/gerrit/#change,28275 fixes libva-intel-driver
to not free the buffer manager before cleaning up BOs, so now vaTerminate
can safely be called.

Also, since we are using X functions and X Pixmaps with VAAPI, there is no need
to use the glx va library just to get the X display. This could have also
potentially got us into trouble in the future, so getting rid of it.

BUG=138758
TEST=Manual runs


Review URL: https://chromiumcodereview.appspot.com/10824051

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@148688 0039d316-1c4b-4281-b951-d872f2087c98

content/common/gpu/media/vaapi_h264_decoder.cc

@@ -34,9 +34,8 @@ namespace content {
 
 void *vaapi_handle = dlopen("libva.so", RTLD_NOW);
 void *vaapi_x11_handle = dlopen("libva-x11.so", RTLD_NOW);
-void *vaapi_glx_handle = dlopen("libva-glx.so", RTLD_NOW);
 
-typedef VADisplay (*VaapiGetDisplayGLX)(Display *dpy);
+typedef VADisplay (*VaapiGetDisplay)(Display *dpy);
 typedef int (*VaapiDisplayIsValid)(VADisplay dpy);
 typedef VAStatus (*VaapiInitialize)(VADisplay dpy,
                                     int *major_version,
@@ -109,7 +108,7 @@ typedef const char* (*VaapiErrorStr)(VAStatus error_status);
     Vaapi##name VAAPI_##name =                                    \
         reinterpret_cast<Vaapi##name>(dlsym((handle), "va"#name))
 
-VAAPI_DLSYM(GetDisplayGLX, vaapi_glx_handle);
+VAAPI_DLSYM(GetDisplay, vaapi_x11_handle);
 VAAPI_DLSYM(DisplayIsValid, vaapi_handle);
 VAAPI_DLSYM(Initialize, vaapi_handle);
 VAAPI_DLSYM(Terminate, vaapi_handle);
@@ -130,7 +129,7 @@ VAAPI_DLSYM(DestroyBuffer, vaapi_handle);
 VAAPI_DLSYM(ErrorStr, vaapi_handle);
 
 static bool AreVaapiFunctionPointersInitialized() {
-  return VAAPI_GetDisplayGLX &&
+  return VAAPI_GetDisplay &&
       VAAPI_DisplayIsValid &&
       VAAPI_Initialize &&
       VAAPI_Terminate &&
@@ -419,10 +418,8 @@ void VaapiH264Decoder::Destroy() {
         DestroyVASurfaces();
       va_res = VAAPI_DestroyConfig(va_display_, va_config_id_);
       VA_LOG_ON_ERROR(va_res, "vaDestroyConfig failed");
-      // TODO(fischman,posciak): call vaTerminate when we figure out why it
-      // crashes.
-      // va_res = VAAPI_Terminate(va_display_);
-      // VA_LOG_ON_ERROR(va_res, "vaTerminate failed");
+       va_res = VAAPI_Terminate(va_display_);
+       VA_LOG_ON_ERROR(va_res, "vaTerminate failed");
       // fallthrough
     case kUninitialized:
       break;
@@ -509,7 +506,7 @@ bool VaapiH264Decoder::Initialize(
     return false;
   }
 
-  va_display_ = VAAPI_GetDisplayGLX(x_display_);
+  va_display_ = VAAPI_GetDisplay(x_display_);
   if (!VAAPI_DisplayIsValid(va_display_)) {
     DVLOG(1) << "Could not get a valid VA display";
     return false;