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

content/common/gpu/media/vaapi_h264_decoder.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <dlfcn.h>
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/stl_util.h"
@@ skipping 16 matching lines @@
       DVLOG(1) << err_msg                                  \
                << " VA error: " << VAAPI_ErrorStr(va_res); \
       return (ret);                                        \
     }                                                      \
   } while (0)
 
 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,
                                     int *minor_version);
 typedef VAStatus (*VaapiTerminate)(VADisplay dpy);
 typedef VAStatus (*VaapiGetConfigAttributes)(VADisplay dpy,
                                              VAProfile profile,
                                              VAEntrypoint entrypoint,
                                              VAConfigAttrib *attrib_list,
                                              int num_attribs);
@@ skipping 52 matching lines @@
                                       unsigned int num_elements,
                                       void *data,
                                       VABufferID *buf_id);
 typedef VAStatus (*VaapiDestroyBuffer)(VADisplay dpy, VABufferID buffer_id);
 typedef const char* (*VaapiErrorStr)(VAStatus error_status);
 
 #define VAAPI_DLSYM(name, handle)                                 \
     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);
 VAAPI_DLSYM(GetConfigAttributes, vaapi_handle);
 VAAPI_DLSYM(CreateConfig, vaapi_handle);
 VAAPI_DLSYM(DestroyConfig, vaapi_handle);
 VAAPI_DLSYM(CreateSurfaces, vaapi_handle);
 VAAPI_DLSYM(DestroySurfaces, vaapi_handle);
 VAAPI_DLSYM(CreateContext, vaapi_handle);
 VAAPI_DLSYM(DestroyContext, vaapi_handle);
 VAAPI_DLSYM(PutSurface, vaapi_x11_handle);
 VAAPI_DLSYM(SyncSurface, vaapi_x11_handle);
 VAAPI_DLSYM(BeginPicture, vaapi_handle);
 VAAPI_DLSYM(RenderPicture, vaapi_handle);
 VAAPI_DLSYM(EndPicture, vaapi_handle);
 VAAPI_DLSYM(CreateBuffer, vaapi_handle);
 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 &&
       VAAPI_GetConfigAttributes &&
       VAAPI_CreateConfig &&
       VAAPI_DestroyConfig &&
       VAAPI_CreateSurfaces &&
       VAAPI_DestroySurfaces &&
       VAAPI_CreateContext &&
       VAAPI_DestroyContext &&
@@ skipping 268 matching lines @@
     case kError:
       destroy_surfaces = true;
       // fallthrough
     case kInitialized:
       if (!make_context_current_.Run())
         break;
       if (destroy_surfaces)
         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;
   }
 
   state_ = kUninitialized;
 }
 
 // Maps Profile enum values to VaProfile values.
 bool VaapiH264Decoder::SetProfile(media::VideoCodecProfile profile) {
@@ skipping 66 matching lines @@
   if (!AreVaapiFunctionPointersInitialized()) {
     DVLOG(1) << "Could not load libva";
     return false;
   }
 
   if (!InitializeFBConfig()) {
     DVLOG(1) << "Could not get a usable FBConfig";
     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;
   }
 
   int major_version, minor_version;
   VAStatus va_res;
   va_res = VAAPI_Initialize(va_display_, &major_version, &minor_version);
   VA_SUCCESS_OR_RETURN(va_res, "vaInitialize failed", false);
   DVLOG(1) << "VAAPI version: " << major_version << "." << minor_version;
@@ skipping 1572 matching lines @@
     }
   }
 }
 
 // static
 size_t VaapiH264Decoder::GetRequiredNumOfPictures() {
   return kNumReqPictures;
 }
 
 }  // namespace content