Message ID | 20220720105646.716398-2-emil.l.velikov@gmail.com |
---|---|
State | New |
Headers | show |
Series | hwcontext_vaapi: dlopen libva-x11 and libva-drm | expand |
Context | Check | Description |
---|---|---|
andriy/configure_x86 | warning | Failed to run configure |
yinshiyou/configure_loongarch64 | warning | Failed to run configure |
On Wed, 20 Jul 2022 at 11:56, Emil Velikov <emil.l.velikov@gmail.com> wrote: > > From: Emil Velikov <emil.velikov@collabora.com> > > There is an internal ABI between libva.so the libva-XXX.so libraries. > > With a recent change, the internal va_fool API was removed breaking the > ABI. So if libva.so and libva-x11.so are from different version, the > whole stack will crash. > > Instead we can dlopen() the libva-x11 library and gracefully error out. > > Signed-off-by: Emil Velikov <emil.velikov@collabora.com> > --- > v2: add libdl dependency > --- > configure | 3 ++- > libavutil/hwcontext_vaapi.c | 34 +++++++++++++++++++++++++++++++++- > 2 files changed, 35 insertions(+), 2 deletions(-) > > diff --git a/configure b/configure > index 18d9b61a99..605afd58a7 100755 > --- a/configure > +++ b/configure > @@ -3816,7 +3816,8 @@ swscale_suggest="libm stdatomic" > > avcodec_extralibs="pthreads_extralibs iconv_extralibs dxva2_extralibs" > avfilter_extralibs="pthreads_extralibs" > -avutil_extralibs="d3d11va_extralibs nanosleep_extralibs pthreads_extralibs vaapi_drm_extralibs vaapi_x11_extralibs vdpau_x11_extralibs" > +avutil_deps="libdl" Hmm, using _deps seems to be causing issues - "libdl at $avdevice_deps is not at $LIBRARY_LIST". In particular, due to the direct dependency between avutil and avdevice, libdl gets propagated into avdevice_deps and libdl where not part of $LIBRARY_LIST. On the other hand, if we use avutil_deps_any libdl does not end up in avdevice_deps (is this intentional), yet it looks incorrect. We're providing a single entry in an "any" list, where we do need the functionality. Be that explicitly from libdl.so or implicitly from the C runtime. Looking at all the other deps - perhaps deps_select is the best option to use here? Aside: Kicking off `make` after configure is changed does not trigger [config.mak] regeneration. Is that intentional? All the other projects that I've used do so. Thanks in advance, Emil
diff --git a/configure b/configure index 18d9b61a99..605afd58a7 100755 --- a/configure +++ b/configure @@ -3816,7 +3816,8 @@ swscale_suggest="libm stdatomic" avcodec_extralibs="pthreads_extralibs iconv_extralibs dxva2_extralibs" avfilter_extralibs="pthreads_extralibs" -avutil_extralibs="d3d11va_extralibs nanosleep_extralibs pthreads_extralibs vaapi_drm_extralibs vaapi_x11_extralibs vdpau_x11_extralibs" +avutil_deps="libdl" +avutil_extralibs="d3d11va_extralibs nanosleep_extralibs pthreads_extralibs vaapi_drm_extralibs vdpau_x11_extralibs" # programs ffmpeg_deps="avcodec avfilter avformat" diff --git a/libavutil/hwcontext_vaapi.c b/libavutil/hwcontext_vaapi.c index c3a98bc4b1..e44d324928 100644 --- a/libavutil/hwcontext_vaapi.c +++ b/libavutil/hwcontext_vaapi.c @@ -18,8 +18,16 @@ #include "config.h" +#if CONFIG_VAAPI_1 +# define VA_ABI ".2" +#else +# define VA_ABI ".1" +#endif + #if HAVE_VAAPI_X11 # include <va/va_x11.h> +# include <dlfcn.h> +# define VA_X11_LIB "libva-x11.so" VA_ABI #endif #if HAVE_VAAPI_DRM # include <va/va_drm.h> @@ -54,6 +62,7 @@ typedef struct VAAPIDevicePriv { #if HAVE_VAAPI_X11 + void *libva_x11; Display *x11_display; #endif @@ -1565,6 +1574,8 @@ static void vaapi_device_free(AVHWDeviceContext *ctx) vaTerminate(hwctx->display); #if HAVE_VAAPI_X11 + if (priv->libva_x11) + dlclose(priv->libva_x11); if (priv->x11_display) XCloseDisplay(priv->x11_display); #endif @@ -1723,14 +1734,35 @@ static int vaapi_device_create(AVHWDeviceContext *ctx, const char *device, #if HAVE_VAAPI_X11 if (!display && try_x11) { + VADisplay (*GetDisplay)(Display *dpy); + + priv->libva_x11 = dlopen(VA_X11_LIB, RTLD_NOW | RTLD_LOCAL); + if (!priv->libva_x11) { + av_log(ctx, AV_LOG_ERROR, "Cannot open %s library %s.\n", + VA_X11_LIB, dlerror()); + return AVERROR_UNKNOWN; + } + + GetDisplay = dlsym(priv->libva_x11, "vaGetDisplay"); + if (!GetDisplay) { + av_log(ctx, AV_LOG_ERROR, "Cannot retrieve %s entrypoint %s.\n", + "vaGetDisplay", dlerror()); + // Always dlclose after the dlerror(). The former can alter the + // error string returned by the latter. + dlclose(priv->libva_x11); + return AVERROR_UNKNOWN; + } + // Try to open the device as an X11 display. priv->x11_display = XOpenDisplay(device); if (!priv->x11_display) { + dlclose(priv->libva_x11); av_log(ctx, AV_LOG_VERBOSE, "Cannot open X11 display " "%s.\n", XDisplayName(device)); } else { - display = vaGetDisplay(priv->x11_display); + display = GetDisplay(priv->x11_display); if (!display) { + dlclose(priv->libva_x11); av_log(ctx, AV_LOG_ERROR, "Cannot open a VA display " "from X11 display %s.\n", XDisplayName(device)); return AVERROR_UNKNOWN;