Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1213)

Unified Diff: content/common/gpu/media/vaapi_wrapper.cc

Issue 16042004: H.264 decoder should dlopen SONAME of libva and libva-x11. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rework after based on r203343 Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/common/gpu/media/vaapi_wrapper.cc
diff --git a/content/common/gpu/media/vaapi_wrapper.cc b/content/common/gpu/media/vaapi_wrapper.cc
index 4b0155219cfaf621b3fab8763f425534c8a8bdaa..4734200f73b532b1d7ddf8a8e5c8d74e185ecbf9 100644
--- a/content/common/gpu/media/vaapi_wrapper.cc
+++ b/content/common/gpu/media/vaapi_wrapper.cc
@@ -408,8 +408,8 @@ bool VaapiWrapper::pre_sandbox_init_done_ = false;
// static
void VaapiWrapper::PreSandboxInitialization() {
DCHECK(!pre_sandbox_init_done_);
- vaapi_handle = dlopen("libva.so", RTLD_NOW);
- vaapi_x11_handle = dlopen("libva-x11.so", RTLD_NOW);
+ vaapi_handle = dlopen("libva.so.1", RTLD_NOW);
+ vaapi_x11_handle = dlopen("libva-x11.so.1", RTLD_NOW);
pre_sandbox_init_done_ = vaapi_handle && vaapi_x11_handle;
}
@@ -443,7 +443,7 @@ bool VaapiWrapper::PostSandboxInitialization() {
VAAPI_DLSYM_OR_RETURN_ON_ERROR(Initialize, vaapi_handle);
VAAPI_DLSYM_OR_RETURN_ON_ERROR(PutSurface, vaapi_x11_handle);
VAAPI_DLSYM_OR_RETURN_ON_ERROR(RenderPicture, vaapi_handle);
- VAAPI_DLSYM_OR_RETURN_ON_ERROR(SyncSurface, vaapi_x11_handle);
+ VAAPI_DLSYM_OR_RETURN_ON_ERROR(SyncSurface, vaapi_handle);
VAAPI_DLSYM_OR_RETURN_ON_ERROR(Terminate, vaapi_handle);
#undef VAAPI_DLSYM
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698