From patchwork Tue Jul 19 16:56:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Emil Velikov X-Patchwork-Id: 36847 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:1649:b0:8b:613a:194d with SMTP id no9csp1879222pzb; Tue, 19 Jul 2022 09:57:21 -0700 (PDT) X-Google-Smtp-Source: AGRyM1vebQI42QvopsyZa1BllxVie5rffKnU10uKyV6Xkw3eGJ37TQk9CtU1htF/1oJ/5BszwLoh X-Received: by 2002:a05:6402:51ca:b0:43a:df65:d180 with SMTP id r10-20020a05640251ca00b0043adf65d180mr45463672edd.255.1658249841591; Tue, 19 Jul 2022 09:57:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1658249841; cv=none; d=google.com; s=arc-20160816; b=Sq+ldsQuBfVAuyGvIGFQ9VF32YZHRf6X8QiPResbkviMpyMuIk9oAFuzee5+JFDnLZ GZkmSBu2r2hegFYap4i3fdWFWAx/B4xfOykL8cdr8Otcl9vWgIER4Y+Aq208PMhD9Dwf IK1LPnXmdQn1gnzhJtrQYlW+oYGFrIAif7naKWpAq2Bqzu+t6CKjzMGHwIU7cH9PJcAs PGH21h8l34ITOTD1cRRBLxV+oEoFdLDfhMsHvBKFA+TMwVwtDM23R2XDqv43okCv6sfB iclNlkHCzF2GiFJWRdngkjO03MQ+Fo04nUICST3OTIuCKgxLQbJFen3n+OIkyPUYS94g hyhw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=jsQk6DPr8k5ScMEQ5ANva4H64suA40APnT5x1wUamt4=; b=DOYkFTqoYBY4qsKb/dTnHOXrh8Y4MqrSDiFPaeUztTONVjPS2i1/K7j5Qyvy6hYqmA AQzI0gUvFX0wddiuduQzohyGFchWzNtAnlAf/npbqC1c3yM8FqIMKgpOBdQltfHtaZas AXUk6zTc49raGdehWZdL636spQaq8wehdihh8MeJJOGAdPWuByzDuzOa793rpZd6PLBD 6uu9PYBbWDm7ZCoey+xbKdAz9UXxzlitxGWDLXh4UllKHm9u3Hl7BABkOjQlQNsq4swL Yi6hanTDzfECQIVzv6ZAOljBytuR1jplkyak5G98UTdIp+lIT/TBas5i9AKZbgNLa6Mo IbEw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=qOtjut9G; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id u4-20020a50eac4000000b0043a1b0e9663si17905554edp.336.2022.07.19.09.57.20; Tue, 19 Jul 2022 09:57:21 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=qOtjut9G; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id DF8D868B701; Tue, 19 Jul 2022 19:57:01 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f45.google.com (mail-wr1-f45.google.com [209.85.221.45]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A702A68B697 for ; Tue, 19 Jul 2022 19:56:59 +0300 (EEST) Received: by mail-wr1-f45.google.com with SMTP id e15so17267591wro.5 for ; Tue, 19 Jul 2022 09:56:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=dO2IOpOSupug+nS9fB6OE6zwqKWk2MZaA/j/xfiaBj0=; b=qOtjut9GWaNc67jdNdIaCbBxuJ9ATvjjaqriKcwFZYvWDe1RSQcwpIhabzvPe/UDxU ucHK47MRkacSEton4H93NRoqdwN8hTOms/5DKlwbaPswuEV7qEtBGpTdI/qsRuAoXOnI PpskjlGlF6TNYkX7TjvkgswZk9uOKICBYDiHKUqgctlgkfrpecLVbWS2/dX5xFQDqXrH wwM38+je7ZHLA5x6dlGvJD1cXsexkk5tHkEABHT1Nt7OmltR96BGcOY53hI8ed+e8HOU CezxE2DVRH0ODM3IwgyFFvbsiAb65K49hFd9/2fyiAJyWEKS4N/Rl3Hk6F7345CtLwcW qHUA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=dO2IOpOSupug+nS9fB6OE6zwqKWk2MZaA/j/xfiaBj0=; b=LnXDoyuiUKBW6Yi/2tcgheCC8CijREJDpFB3uL4nd46IZosFshzgqrYFQ0VgaqnFTP OWkuC4AHX6D3VHmIqaBsgfdtbOJFqCz9Ca7AM9cF0fs07Q8FHZ0PZQV2gGVPQQ8c9BVM xNUrT+mwug2Grg6BZitIqtISOTGUS1hot+AzgRO0NmzxuRCesal9uZwOju8FG0B46yjp zeA0RKJMhKfWEBnA7DFiCAJTrQYn6mjyUxUWua5KzpllEoVIiprl4QTi647qwR/l/GPy 3CHDbuhYm14YkRmJXmi1ZKChR01bpjs8gLQdlXEswybcpCTiJuhrO6Uv9IOmfCLhOviu xsTQ== X-Gm-Message-State: AJIora/mxYESPUkjQn+jTiJdQm+te7+S1Yw0GTH4ZXYXQx9ek4IpN6sJ GXr00UoPcT3rR+poaF5Mr2zrmuDOsW8vKg== X-Received: by 2002:adf:f20a:0:b0:21e:2608:9390 with SMTP id p10-20020adff20a000000b0021e26089390mr7175341wro.577.1658249818510; Tue, 19 Jul 2022 09:56:58 -0700 (PDT) Received: from localhost ([2a00:5f00:102:0:ed02:7072:7dbf:2431]) by smtp.gmail.com with UTF8SMTPSA id l13-20020a05600c2ccd00b003a2f2bb72d5sm26984593wmc.45.2022.07.19.09.56.57 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 19 Jul 2022 09:56:58 -0700 (PDT) From: Emil Velikov To: ffmpeg-devel@ffmpeg.org Date: Tue, 19 Jul 2022 17:56:55 +0100 Message-Id: <20220719165656.640869-3-emil.l.velikov@gmail.com> X-Mailer: git-send-email 2.37.0 In-Reply-To: <20220719165656.640869-1-emil.l.velikov@gmail.com> References: <20220719165656.640869-1-emil.l.velikov@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/3] hwcontext_vaapi: do not link against libva-drm.so X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Mark Thompson , emil.l.velikov@gmail.com Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: tYxxgJDE2EW/ From: Emil Velikov There is an internal ABI between libva.so and libva-drm.so. So having mismatched versions can cause all sorts of issues. We had the breakage between libva.so and libva-x11.so addressed with earlier commit. There's no point in waiting for things to break wrt libva-drm.so so pre-emptively, switch to dlopen()-ing the library. Cc: Mark Thompson Signed-off-by: Emil Velikov --- configure | 2 +- libavutil/hwcontext_vaapi.c | 48 +++++++++++++++++++++++++++++++++++-- 2 files changed, 47 insertions(+), 3 deletions(-) diff --git a/configure b/configure index ab2a29544c..3d0fe0df61 100755 --- a/configure +++ b/configure @@ -3816,7 +3816,7 @@ 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 vdpau_x11_extralibs" +avutil_extralibs="d3d11va_extralibs nanosleep_extralibs pthreads_extralibs vdpau_x11_extralibs" # programs ffmpeg_deps="avcodec avfilter avformat" diff --git a/libavutil/hwcontext_vaapi.c b/libavutil/hwcontext_vaapi.c index e44d324928..7734a50fc0 100644 --- a/libavutil/hwcontext_vaapi.c +++ b/libavutil/hwcontext_vaapi.c @@ -31,6 +31,8 @@ #endif #if HAVE_VAAPI_DRM # include +# include +# define VA_DRM_LIB "libva-drm.so" VA_ABI #endif #if CONFIG_LIBDRM @@ -66,6 +68,7 @@ typedef struct VAAPIDevicePriv { Display *x11_display; #endif + void *libva_drm; int drm_fd; } VAAPIDevicePriv; @@ -1582,6 +1585,8 @@ static void vaapi_device_free(AVHWDeviceContext *ctx) if (priv->drm_fd >= 0) close(priv->drm_fd); + if (priv->libva_drm) + dlclose(priv->libva_drm); av_freep(&priv); } @@ -1665,6 +1670,8 @@ static int vaapi_device_create(AVHWDeviceContext *ctx, const char *device, #if HAVE_VAAPI_DRM while (!display && try_drm) { + VADisplay (*GetDisplayDRM)(int fd); + // If the device is specified, try to open it as a DRM device node. // If not, look for a usable render node, possibly restricted to those // using a specified kernel driver. @@ -1722,8 +1729,26 @@ static int vaapi_device_create(AVHWDeviceContext *ctx, const char *device, break; } - display = vaGetDisplayDRM(priv->drm_fd); + priv->libva_drm = dlopen(VA_DRM_LIB, RTLD_NOW | RTLD_LOCAL); + if (!priv->libva_drm) { + av_log(ctx, AV_LOG_ERROR, "Cannot open %s library %s.\n", + VA_DRM_LIB, dlerror()); + return AVERROR_UNKNOWN; + } + + GetDisplayDRM = dlsym(priv->libva_drm, "vaGetDisplayDRM"); + if (!GetDisplayDRM) { + av_log(ctx, AV_LOG_ERROR, "Cannot retrieve %s entrypoint %s.\n", + "vaGetDisplayDRM", dlerror()); + // Always dlclose after the dlerror(). The former can alter the + // error string returned by the latter. + dlclose(priv->libva_drm); + return AVERROR_UNKNOWN; + } + + display = GetDisplayDRM(priv->drm_fd); if (!display) { + dlclose(priv->libva_drm); av_log(ctx, AV_LOG_VERBOSE, "Cannot open a VA display " "from DRM device %s.\n", device); return AVERROR_EXTERNAL; @@ -1811,6 +1836,7 @@ static int vaapi_device_derive(AVHWDeviceContext *ctx, #if HAVE_VAAPI_DRM if (src_ctx->type == AV_HWDEVICE_TYPE_DRM) { AVDRMDeviceContext *src_hwctx = src_ctx->hwctx; + VADisplay (*GetDisplayDRM)(int fd); VADisplay *display; VAAPIDevicePriv *priv; int fd; @@ -1879,8 +1905,26 @@ static int vaapi_device_derive(AVHWDeviceContext *ctx, ctx->user_opaque = priv; ctx->free = &vaapi_device_free; - display = vaGetDisplayDRM(fd); + priv->libva_drm = dlopen(VA_DRM_LIB, RTLD_NOW | RTLD_LOCAL); + if (!priv->libva_drm) { + av_log(ctx, AV_LOG_ERROR, "Cannot open %s library %s.\n", + VA_DRM_LIB, dlerror()); + return AVERROR_UNKNOWN; + } + + GetDisplayDRM = dlsym(priv->libva_drm, "vaGetDisplayDRM"); + if (!GetDisplayDRM) { + av_log(ctx, AV_LOG_ERROR, "Cannot retrieve %s entrypoint %s.\n", + "vaGetDisplayDRM", dlerror()); + // Always dlclose after the dlerror(). The former can alter the + // error string returned by the latter. + dlclose(priv->libva_drm); + return AVERROR_UNKNOWN; + } + + display = GetDisplayDRM(fd); if (!display) { + dlclose(priv->libva_drm); av_log(ctx, AV_LOG_ERROR, "Failed to open a VA display from " "DRM device.\n"); return AVERROR(EIO);