diff mbox

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

Message ID 04a7eb97-a5ae-f630-bdca-b3e268549692@jkqxz.net
State Superseded
Headers show

Commit Message

Mark Thompson Nov. 14, 2018, 12:21 a.m. UTC 
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.
---
 libavutil/hwcontext_vaapi.c | 13 +++++++++++++
 1 file changed, 13 insertions(+)

Comments

Michael Niedermayer Nov. 14, 2018, 12:05 p.m. UTC | #1 
On Wed, Nov 14, 2018 at 12:21:07AM +0000, Mark Thompson wrote:
> 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.
> ---
>  libavutil/hwcontext_vaapi.c | 13 +++++++++++++
>  1 file changed, 13 insertions(+)
> 
> diff --git a/libavutil/hwcontext_vaapi.c b/libavutil/hwcontext_vaapi.c
> index 8624369bb9..eb3a78d181 100644
> --- a/libavutil/hwcontext_vaapi.c
> +++ b/libavutil/hwcontext_vaapi.c
> @@ -1469,6 +1469,8 @@ static int vaapi_device_create(AVHWDeviceContext *ctx, const char *device,
>  {
>      VAAPIDevicePriv *priv;
>      VADisplay display = NULL;
> +    const AVDictionaryEntry *driver;
> +    VAStatus vas;
>  
>      priv = av_mallocz(sizeof(*priv));
>      if (!priv)
> @@ -1530,6 +1532,17 @@ static int vaapi_device_create(AVHWDeviceContext *ctx, const char *device,
>          return AVERROR(EINVAL);
>      }
>  
> +    driver = av_dict_get(opts, "driver", NULL, 0);
> +    if (driver) {
> +        vas = vaSetDriverName(display, driver->value);

this breaks build here on ubuntu:

CC	libavutil/hwcontext_vaapi.o
libavutil/hwcontext_vaapi.c: In function ‘vaapi_device_create’:
libavutil/hwcontext_vaapi.c:1537:9: error: implicit declaration of function ‘vaSetDriverName’ [-Werror=implicit-function-declaration]
         vas = vaSetDriverName(display, driver->value);
         ^
cc1: some warnings being treated as errors
make: *** [libavutil/hwcontext_vaapi.o] Error 1
make: Target `all' not remade because of errors.


[...]
diff mbox

Patch

diff --git a/libavutil/hwcontext_vaapi.c b/libavutil/hwcontext_vaapi.c
index 8624369bb9..eb3a78d181 100644
--- a/libavutil/hwcontext_vaapi.c
+++ b/libavutil/hwcontext_vaapi.c
@@ -1469,6 +1469,8 @@  static int vaapi_device_create(AVHWDeviceContext *ctx, const char *device,
 {
     VAAPIDevicePriv *priv;
     VADisplay display = NULL;
+    const AVDictionaryEntry *driver;
+    VAStatus vas;
 
     priv = av_mallocz(sizeof(*priv));
     if (!priv)
@@ -1530,6 +1532,17 @@  static int vaapi_device_create(AVHWDeviceContext *ctx, const char *device,
         return AVERROR(EINVAL);
     }
 
+    driver = av_dict_get(opts, "driver", NULL, 0);
+    if (driver) {
+        vas = vaSetDriverName(display, driver->value);
+        if (vas != VA_STATUS_SUCCESS) {
+            av_log(ctx, AV_LOG_ERROR, "Failed to set driver name to "
+                   "%s: %d (%s).\n", driver->value, vas, vaErrorStr(vas));
+            vaTerminate(display);
+            return AVERROR_UNKNOWN;
+        }
+    }
+
     return vaapi_device_connect(ctx, display);
 }