From patchwork Wed Jul 20 10:56:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Emil Velikov X-Patchwork-Id: 36869 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:1649:b0:8b:613a:194d with SMTP id no9csp2316756pzb; Wed, 20 Jul 2022 03:57:08 -0700 (PDT) X-Google-Smtp-Source: AGRyM1sAQaJ/FX+cAV+tEVAVYYzWMG5QNcb/32gyswtVEBks4hQfXoiYdlKv4zY6IQg/WxhHcHQe X-Received: by 2002:a17:907:75d9:b0:72b:1472:ba19 with SMTP id jl25-20020a17090775d900b0072b1472ba19mr34098250ejc.657.1658314628696; Wed, 20 Jul 2022 03:57:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1658314628; cv=none; d=google.com; s=arc-20160816; b=dOB1flefLwh8mAaav0XCkqjS5VeA0/mn2ZAX8ay024VMMYDaLGYnqXByxN28c3xjor 7A49fgY81rZJh/zET/DnTnFTT21dDYAfa/gFawBJALXucPkh4qYSSlATQR6xYPMf5RUr 4Vjb5C9T4kTyoulk/vlp/Fs+YRQkzzuGibBLtngcpA6v9c41tzcAeneWHo9cPDHHjk/W bQVGuCThFJi6wjt5H/MCwvm/mf6cVy2Vj+tmC+UkWjxzPVOcDRxgcUo1zJVN1yxMpFCH BqVKj/dmVnbRf5EpmKTjeMdiygvoplDUH+oYSFSl3Yn4tBdg/AlZFP+Hzhp8yTgMbbpl Gvig== 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=2kDyigOKvxhCrkCgGx3Jp/hXkmO8l2FLa9B9ZKJZ3jA=; b=UldBtgEf12fxRJl4mgvltSfkIV5vNUsWNov3klKmBoILb2KUijejxJ0+ca3OwEjYwp Mj9eLQ51YbZOELFf6S6IwDcni4PN61npda+ldfachMHfrvmWpI5JSlpfokPJLmWki65a NO2rCSWH7xgdgEkqujLW8ZP6cwBqg130tgxY4UHY3FStcw9C8QZTXSxVUlt7iD9cIGaV ySzW7JuiEO95bL1esX/T4p2yjUHSOPtfE+dyYqTMLb3D3x1jQeUzwpnlF/krp30MOj8G KdAyrDOGjYfDwQp5dleIUkLx9oWlbVQLEEAzZ4AGbmkqzO9ZQPCOT1Y/46HUxG9Q0We2 aqRg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=lkIT+rmD; 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 h8-20020a0564020e0800b0043a9b826da3si21033718edh.233.2022.07.20.03.57.08; Wed, 20 Jul 2022 03:57:08 -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=lkIT+rmD; 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 50B2968B61E; Wed, 20 Jul 2022 13:56:57 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.45]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2C18168B5C5 for ; Wed, 20 Jul 2022 13:56:49 +0300 (EEST) Received: by mail-wm1-f45.google.com with SMTP id i132-20020a1c3b8a000000b003a2fa488efdso1086659wma.4 for ; Wed, 20 Jul 2022 03:56:49 -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=QpwykVC8oN/WPk5bg/oQwdRcYHl9HLc+vi/99eUa/fI=; b=lkIT+rmDluec/TlF0CiHC5eHKyzbOQMBYG2jSQ2BFeIusZlSVQ//pOBemGr0eQ5krx Vb48pLC0u4SHMnlhRcz1yfNpBBl/0EgTL3Ql7SINjiXk+F7zBxfyyLjhrj9FWwTUxpV/ iOCu7sWLtOj69AeXdHw32WYJnPlBTEtUfCydaQfoXo/9kh2OycVxJ23YGo+fBz64j7Fr Bn8oIMqz+lfN/jcx4BuA6+0bZEihvd2YXqZwkyl9reZ3Wzi61fNxNckYlZVrvqZdgncE AxhBU62DpwWZBCwoHO2YuiT5RsKBjrL142xUt1RLm2a1a7kZ6nUrfZ3S32tEg8ZKNeJ2 jxZA== 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=QpwykVC8oN/WPk5bg/oQwdRcYHl9HLc+vi/99eUa/fI=; b=W+tnoE/XATQldzPr++EcUHpc/RT/x6VJSpcLiOOiAaJphpOhT2rNoTAW2nwGrAZxlK nr3rS9K6fS1cYAnCReY4zHIUvMl5O18XxuX0pxdikoqDzPAnBQOoX+BzVOwdFSvjVpav QBQldzoo3UqNopUaZYfD2fKFfg3BdTG7547c2fLN5c6RvZw4BYAqDZQT2hD8sGRP+fE+ nZbeAC4fkDfk6bvLQY/ucU4B25JVR9z2N3JXcYzwGkL+ndad9Xua6km2Vu8eGa5RgT43 NEQdBrKcJkXB5AWHHhb4bOGMdP4B4HLCHlmaGCwELTtYaoJhuBEeCm1c9yl+qM+mgP8S xP6Q== X-Gm-Message-State: AJIora+LDANm0AaoZ8HfRjQPFF3Jk6+AhJpGYWcjFEmjmWraeykoAq7K fonz4aLogzCLlQtgR94pu3Uj9n65B5tTRw== X-Received: by 2002:a05:600c:1e29:b0:3a3:d15:e6fb with SMTP id ay41-20020a05600c1e2900b003a30d15e6fbmr3397286wmb.5.1658314608297; Wed, 20 Jul 2022 03:56:48 -0700 (PDT) Received: from localhost ([2a00:5f00:102:0:a792:c012:897f:7da6]) by smtp.gmail.com with UTF8SMTPSA id c14-20020a5d4cce000000b0021d82a6095bsm15650632wrt.95.2022.07.20.03.56.47 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 20 Jul 2022 03:56:47 -0700 (PDT) From: Emil Velikov To: ffmpeg-devel@ffmpeg.org Date: Wed, 20 Jul 2022 11:56:44 +0100 Message-Id: <20220720105646.716398-2-emil.l.velikov@gmail.com> X-Mailer: git-send-email 2.37.0 In-Reply-To: <20220720105646.716398-1-emil.l.velikov@gmail.com> References: <20220720105646.716398-1-emil.l.velikov@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 1/3] hwcontext_vaapi: do not link against libva-x11.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: Xk6T4hA2xN/y From: Emil Velikov 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 --- 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" +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 +# include +# define VA_X11_LIB "libva-x11.so" VA_ABI #endif #if HAVE_VAAPI_DRM # include @@ -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; From patchwork Wed Jul 20 10:56:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Emil Velikov X-Patchwork-Id: 36870 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:1649:b0:8b:613a:194d with SMTP id no9csp2316830pzb; Wed, 20 Jul 2022 03:57:17 -0700 (PDT) X-Google-Smtp-Source: AGRyM1ujlyvhXH4Z0jLSVvqXYS4/EtiLquwkp718s3dfnk3k9hzXqIW+rrxghzrKiX4MgPaU2nw4 X-Received: by 2002:a05:6402:1c0d:b0:43b:bbf3:fb44 with SMTP id ck13-20020a0564021c0d00b0043bbbf3fb44mr672452edb.282.1658314637609; Wed, 20 Jul 2022 03:57:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1658314637; cv=none; d=google.com; s=arc-20160816; b=HGAxjLLLuLAl1B6eG05MHrxMS5fiXkf2Ope/uskCc68xUKCuUHLtG9G1Qr9gUtFiOr ZJJjRL+TN0+LbMq2+9hKuR4GTiJzPJJlHa9pDeje+wFqqLYaUwOkz0FS6jSu2VknrFvw 2dzP2EUCHNEXF+8gOkm8HTEtuu61a3GsoSJkPazfntRSNjiyolFPQ6qsZ4d+2lPkndNl +L57ObGXiTKcD0/EGQsQneqSL1ohHZapXhIikLe3nmcXNL1Bi1rrgRmLoalMr9emFRqZ R5PixaqOUrYzl4XWwpf2aFawuFUkNOJi12lgAbDKKurjcN2hOQgykdcNJTKAQAxeK03r YkvQ== 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=rmqiDqqJJfXHel2HoDxITLutlPoDHFiZmARYwa5FPi8=; b=vHkB8jyfADd8WjyjcaBPuTZYsqiM4IlZmmuiAQqSWpTiCHSPKBpEsJTzLoTggwoqQi vWHOXKySQmEDSAFaF1dQ7norHc1Sk1xOgkBe68YpPd6JarCoxCJfF58Lx6LhXM/+yG+e yTKPJnLzXD+0NgsAHxWgnnZo+EmkX9VfcKot2JA2EH9wyc5U4uMJjBOX3PyD+f9Zm+G2 HEcc5yWEcB+j5MTD71TVJIdcsBDnB+wB5eGoguA8s5BOIM74ZQRrI+VKtUnBr8Bjxvtm Dr9v7+8VXTH6BVkcpsfexzai3lkmpXvXMQCnv/OTbVnvS19K9cpJdS3ylHVNfK4yE+9U TgzA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=alaWtdAw; 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 d21-20020a17090694d500b00726e16c2d4fsi18500758ejy.178.2022.07.20.03.57.17; Wed, 20 Jul 2022 03:57:17 -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=alaWtdAw; 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 50BDF68B636; Wed, 20 Jul 2022 13:56:58 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f43.google.com (mail-wr1-f43.google.com [209.85.221.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2281268B4F7 for ; Wed, 20 Jul 2022 13:56:50 +0300 (EEST) Received: by mail-wr1-f43.google.com with SMTP id e15so20330349wro.5 for ; Wed, 20 Jul 2022 03:56:50 -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=bqK6p0//qMjA9pkodzGvMtaZoaxnfbcQdoanKEv4cag=; b=alaWtdAw9lI+NBiFmGjnxGWA7wy3BeMhNtvTEuXp4hDZXrz5oXuZhuua++8WRRbpKA tukzv8AGjh8YGx0tLJbh01JKiVAlaIIUxDuOGn2B8Lf2vTIZYH7RJgKu0law3jnhWGRO rEOVsWtDMZRZXMGnVAKnBi+H+Graq08QUaCNuUL/ykAYmlC47i9v8dR4uMWgrsnk+U8N sbFTGl5a2em2NbwMb7HMEGv/DgVrTqJTaB/zu30x+QDx0uBX1qGdws2rtigEIK3hrBYJ YcI3iYPtGzdNHzGntEUDcBZi5LV+voWUJy/LQMEi+1IQjPfB6/L8A43xY8jlWXYPVNt1 NEoQ== 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=bqK6p0//qMjA9pkodzGvMtaZoaxnfbcQdoanKEv4cag=; b=6cSrz9sD6SMqhwyHP2Xjht2yRwm08wMTLGLvfLhiFRQYc646iVFAFhW95R3Mb/QQU+ eIHXyBtjKbQqa8sVnFkgZaYxYGLMJcU0PmPh7qbkkurLppjcqzu/rKVnBkiHy+xiRPga fmW903NM5jXETwMLNAIDw3Ok4jGTsx5bZJb+NQ8rUmV06WI1jo8mIV1BMZhY/FG9aozG UXRWxzlyhHhGcN8Mf//V3UMm/esHsB9w6w4cS3Mk4wmjfq5RWPU/M4n9DePsP3WV3d46 u4MxiNCpfBmIE9yK/klET2hWxtFM384MP8cbQVCLEbY2hZRGkmoUrAFizZC8YVLnIjco d2vg== X-Gm-Message-State: AJIora8mkparD1lLtBugSzptHnMAqa1M6L5NrawSNr2f1NsWtcWWNxeW nkS3ni7RwqFhH6uhCL1OdZYjRagE88MgKg== X-Received: by 2002:a5d:6391:0:b0:21e:4d6c:5e28 with SMTP id p17-20020a5d6391000000b0021e4d6c5e28mr985610wru.575.1658314609217; Wed, 20 Jul 2022 03:56:49 -0700 (PDT) Received: from localhost ([2a00:5f00:102:0:a792:c012:897f:7da6]) by smtp.gmail.com with UTF8SMTPSA id v130-20020a1cac88000000b003a03be171b1sm2079205wme.43.2022.07.20.03.56.48 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 20 Jul 2022 03:56:48 -0700 (PDT) From: Emil Velikov To: ffmpeg-devel@ffmpeg.org Date: Wed, 20 Jul 2022 11:56:45 +0100 Message-Id: <20220720105646.716398-3-emil.l.velikov@gmail.com> X-Mailer: git-send-email 2.37.0 In-Reply-To: <20220720105646.716398-1-emil.l.velikov@gmail.com> References: <20220720105646.716398-1-emil.l.velikov@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 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: swhxuw1nOh2X 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. Signed-off-by: Emil Velikov --- v2: rebase against the libdl fixup --- configure | 2 +- libavutil/hwcontext_vaapi.c | 48 +++++++++++++++++++++++++++++++++++-- 2 files changed, 47 insertions(+), 3 deletions(-) diff --git a/configure b/configure index 605afd58a7..a941d4b927 100755 --- a/configure +++ b/configure @@ -3817,7 +3817,7 @@ swscale_suggest="libm stdatomic" avcodec_extralibs="pthreads_extralibs iconv_extralibs dxva2_extralibs" avfilter_extralibs="pthreads_extralibs" avutil_deps="libdl" -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); From patchwork Wed Jul 20 10:56:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Emil Velikov X-Patchwork-Id: 36871 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:1649:b0:8b:613a:194d with SMTP id no9csp2316905pzb; Wed, 20 Jul 2022 03:57:27 -0700 (PDT) X-Google-Smtp-Source: AGRyM1v5EDOIrxrzNGM70RhDgRL+AM0nmFXToKbKggrIxMXfhHli+gJa1Q/gYgZG1dsEXohzUOiQ X-Received: by 2002:a05:6402:40cb:b0:43a:8a99:225f with SMTP id z11-20020a05640240cb00b0043a8a99225fmr50073626edb.414.1658314646867; Wed, 20 Jul 2022 03:57:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1658314646; cv=none; d=google.com; s=arc-20160816; b=w0mLl5qEtZGMtx3C+mYY3tJoW9VxxhjObT6/Ly1YAVcPsGO0GbrX1Gsgh9yCWdn3ay jcYMzeEgCV7m8T/jOtJxhJAgKwUeuU1RGIGB7hBkJcN7fD20uZXmyqwmXfUJ3cK27OsM 0BDY2tQt6+Pc0ihcdKid4zwnAOYBKI/bscm3MKrewbU3b1Zv7TDeUM6ZL7dkEOKSukjB CcG5SAn0hP1/eFnbU21J5FbvLH08RqQurYREWycRDHPJmKUcAwNRlnl9k4BBlZioMU38 sswF3SX3qNr1eMKjEczqYFaESlCifJg1mn1OM4D9h8tfEnfpGP2JQIKzGZt8yn8MfLXe g25w== 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=BcLho3uGRNXakEGX3HpEwgy8mzJmHvXM8A1DxU7wAwY=; b=L4WFCLCU/N9vvOLSvjkeBsijGQEGdjwl5+059Gh5lyNW2bAH0dDrB3kGY6XyJszFrR 201QWOnJ/ODjJtdpt/lODfv2RFLZ6MENimQFlKUFlu/e4I6kD5z9HRiWTvtdXrgRPT4x Wzeb1YZggmzRBfcVcE9QzpGzYuArJQUFRqL9U9sMM9RMkt6lS6ymM6NIY5DW7FyyzZ7u qRtceIBBOerB6uNyzyT/AAuDpzdzSmiDSCCP95cg8UqJDz65wsLxr3MbAjbaGRxQzqZd OyDDpIEyVlH52cahTLl0hx/uyBg5w83hwqnvd0231uACtbNukKCv8un3RK4l+XSZ0PST foPw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=Kevl734F; 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 ds18-20020a170907725200b0072f48ca37d2si8718463ejc.442.2022.07.20.03.57.26; Wed, 20 Jul 2022 03:57:26 -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=Kevl734F; 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 6A82068B63E; Wed, 20 Jul 2022 13:56:59 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f41.google.com (mail-wr1-f41.google.com [209.85.221.41]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1F61068B4F7 for ; Wed, 20 Jul 2022 13:56:51 +0300 (EEST) Received: by mail-wr1-f41.google.com with SMTP id bv24so1706499wrb.3 for ; Wed, 20 Jul 2022 03:56:51 -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=NiISEWjCvxMmLjbGtLQbTWOOWWCDJ7ixm39d5/O4k+E=; b=Kevl734FUHeQsPfkxWJylZbr4nKsB/JKQk4d64rOgdYSmGmW3pv3WdSH2RmDzefEVr 2un/j2soUCuINiZ/So7CDSsOvwUoDA3Ajp0p7hbTu6lSQHhWtdnpjsEqaNhcVpoajaWX zuA2fGPz7Js9j4/B0jhEox5bYbKGiLM1g/t+Nse0Rqg8oWhr3Fdgr/kgLuG9Mo6G1UMu swqi3wsf+erGqDLCngSA9rgJ5yJrC/E3/rV8T7ahTEZSxMW7XahlshGUj7PNe4hsVS4O J33XHhY1goQSuQVCgDTi1FfRhuwxxWtS51jbNrtelWeXgbjzdnQJ2ERY3ublnYVdhU4f FC+Q== 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=NiISEWjCvxMmLjbGtLQbTWOOWWCDJ7ixm39d5/O4k+E=; b=0HYj1hIPdYCB+erSSxdHL0uPmAftAS1/E9pQlHCgAIV+Pj9ZNgEpDbb+Uhc0r5tRjo VeBFo6mPuhybdNJNAz5lv/vse6HvqZEcJW2SYBRYI5osnxTGyM5XT6Ydi86Cf0IUAYHm GgRIY1Bo4DJ2nAB5owxOCi7xgnKy3TZ1BLGKg4Oz039PTbDTdJYREUKsWte1jqzp4E/H +sCux2gfe/jrDvRezRBpWgDF2Id82ulOgij/Ee/dAzG6l6gessKs7DHO3NYFRveMQJCT kOi/Mrwoyk8yP6UTmMKAJ1pnkbDgfbx9pF2gLX4iS8J+8dqwzHsacaIMBCm27aVy9MIV Pe1g== X-Gm-Message-State: AJIora8XQzo5JrXLoGkcJ4UlgnxWxhw0vUViRzhVGsli3KM96cXYyXs7 4tsrgmqOIiwk3Nmq0eydoz6fcmlJs55dFQ== X-Received: by 2002:adf:f3c7:0:b0:21d:9349:7a5 with SMTP id g7-20020adff3c7000000b0021d934907a5mr30292325wrp.23.1658314610190; Wed, 20 Jul 2022 03:56:50 -0700 (PDT) Received: from localhost ([2a00:5f00:102:0:a792:c012:897f:7da6]) by smtp.gmail.com with UTF8SMTPSA id b16-20020a056000055000b0021e2fccea97sm4415927wrf.64.2022.07.20.03.56.49 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 20 Jul 2022 03:56:49 -0700 (PDT) From: Emil Velikov To: ffmpeg-devel@ffmpeg.org Date: Wed, 20 Jul 2022 11:56:46 +0100 Message-Id: <20220720105646.716398-4-emil.l.velikov@gmail.com> X-Mailer: git-send-email 2.37.0 In-Reply-To: <20220720105646.716398-1-emil.l.velikov@gmail.com> References: <20220720105646.716398-1-emil.l.velikov@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 3/3] hwcontext_vaapi: #if guard VAAPI_DRM specifics 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: Mu1+OYoiFsuW From: Emil Velikov Similar to the VAAPI_X11 bits, guard all the VAAPI_DRM parts behind a compiler guard. Signed-off-by: Emil Velikov --- libavutil/hwcontext_vaapi.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/libavutil/hwcontext_vaapi.c b/libavutil/hwcontext_vaapi.c index 7734a50fc0..7aea3e7b96 100644 --- a/libavutil/hwcontext_vaapi.c +++ b/libavutil/hwcontext_vaapi.c @@ -18,6 +18,10 @@ #include "config.h" +#if !HAVE_VAAPI_X11 && !HAVE_VAAPI_DRM +#error "At least one VAAPI winsys is required X11 or DRM" +#endif + #if CONFIG_VAAPI_1 # define VA_ABI ".2" #else @@ -68,8 +72,10 @@ typedef struct VAAPIDevicePriv { Display *x11_display; #endif +#if HAVE_VAAPI_DRM void *libva_drm; int drm_fd; +#endif } VAAPIDevicePriv; typedef struct VAAPISurfaceFormat { @@ -1583,10 +1589,12 @@ static void vaapi_device_free(AVHWDeviceContext *ctx) XCloseDisplay(priv->x11_display); #endif +#if HAVE_VAAPI_DRM if (priv->drm_fd >= 0) close(priv->drm_fd); if (priv->libva_drm) dlclose(priv->libva_drm); +#endif av_freep(&priv); } @@ -1645,7 +1653,9 @@ static int vaapi_device_create(AVHWDeviceContext *ctx, const char *device, if (!priv) return AVERROR(ENOMEM); +#if HAVE_VAAPI_DRM priv->drm_fd = -1; +#endif ctx->user_opaque = priv; ctx->free = vaapi_device_free;