[FFmpeg-cvslog] hwcontext_vaapi: Add option to set driver name

Mark Thompson git at videolan.org
Mon Jun 3 01:05:48 EEST 2019


ffmpeg | branch: master | Mark Thompson <sw at jkqxz.net> | Wed Nov 14 21:25:00 2018 +0000| [7f3f5a24a1c70c6a8e72cdf387252ce0d1afee7f] | committer: Mark Thompson

hwcontext_vaapi: Add option to set driver name

For example: -init_hw_device vaapi:/dev/dri/renderD128,driver=foo

This may be more convenient that using the environment variable, and allows
loading different drivers for different devices in the same process.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7f3f5a24a1c70c6a8e72cdf387252ce0d1afee7f
---

 libavutil/hwcontext_vaapi.c | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/libavutil/hwcontext_vaapi.c b/libavutil/hwcontext_vaapi.c
index 941c257b1b..f05b9ee9cf 100644
--- a/libavutil/hwcontext_vaapi.c
+++ b/libavutil/hwcontext_vaapi.c
@@ -1598,6 +1598,23 @@ static int vaapi_device_create(AVHWDeviceContext *ctx, const char *device,
         return AVERROR(EINVAL);
     }
 
+    ent = av_dict_get(opts, "driver", NULL, 0);
+    if (ent) {
+#if VA_CHECK_VERSION(0, 38, 0)
+        VAStatus vas;
+        vas = vaSetDriverName(display, ent->value);
+        if (vas != VA_STATUS_SUCCESS) {
+            av_log(ctx, AV_LOG_ERROR, "Failed to set driver name to "
+                   "%s: %d (%s).\n", ent->value, vas, vaErrorStr(vas));
+            vaTerminate(display);
+            return AVERROR_EXTERNAL;
+        }
+#else
+        av_log(ctx, AV_LOG_WARNING, "Driver name setting is not "
+               "supported with this VAAPI version.\n");
+#endif
+    }
+
     return vaapi_device_connect(ctx, display);
 }
 



More information about the ffmpeg-cvslog mailing list