From e1b50fd3949387fc973505d45d57a8f685b4780c Mon Sep 17 00:00:00 2001
From: philippegorley <philippe.gorley@savoirfairelinux.com>
Date: Thu, 22 Jun 2017 16:39:39 -0400
Subject: [PATCH] accel: let xlib choose the device if using vaapi-x11
Change-Id: I2c21585512831cadfeaae39119d2b6c9fc372775
Reviewed-by: Guillaume Roguez <guillaume.roguez@savoirfairelinux.com>
---
src/media/video/v4l2/vaapi.cpp | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/media/video/v4l2/vaapi.cpp b/src/media/video/v4l2/vaapi.cpp
index 703469aa9d..414da2342e 100644
--- a/src/media/video/v4l2/vaapi.cpp
+++ b/src/media/video/v4l2/vaapi.cpp
@@ -91,8 +91,7 @@ VaapiAccel::checkAvailability()
if (hardwareDeviceCtx == nullptr)
return false;
#elif HAVE_VAAPI_ACCEL_X11
- deviceName_ = ":0";
- if (av_hwdevice_ctx_create(&hardwareDeviceCtx, AV_HWDEVICE_TYPE_VAAPI, deviceName_.c_str(), nullptr, 0) < 0) {
+ if (av_hwdevice_ctx_create(&hardwareDeviceCtx, AV_HWDEVICE_TYPE_VAAPI, nullptr, nullptr, 0) < 0) {
return false;
}
#endif
@@ -123,7 +122,10 @@ VaapiAccel::init()
codecCtx_->hw_frames_ctx = av_buffer_ref(framesBufferRef_.get());
- RING_DBG("VAAPI decoder initialized via device: %s", deviceName_.c_str());
+ if (!deviceName_.empty())
+ RING_DBG("VAAPI decoder initialized via device: %s", deviceName_.c_str());
+ else
+ RING_DBG("VAAPI decoder initialized");
return true;
}
--
GitLab