From patchwork Tue Jul 19 16:56:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Emil Velikov X-Patchwork-Id: 36848 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:1649:b0:8b:613a:194d with SMTP id no9csp1879340pzb; Tue, 19 Jul 2022 09:57:32 -0700 (PDT) X-Google-Smtp-Source: AGRyM1uCtbx2JocnyIkDXLDrQSeloC6iYHOq8pvUcAPnF/xijigLEXlDIzrwyiaSE0nWnDj4I5vn X-Received: by 2002:a17:906:6a0a:b0:72b:60b8:d2e7 with SMTP id qw10-20020a1709066a0a00b0072b60b8d2e7mr29900184ejc.607.1658249852520; Tue, 19 Jul 2022 09:57:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1658249852; cv=none; d=google.com; s=arc-20160816; b=qIFuylLjbSignU+66LIxKegX0DsJColcMZk2lmY5ytkebf5PbBR3/p37lktxnqVrmu UlLKTpXvCVuYeUG4HG2pUbU0bLA7SXPhY4zq7r5ZTQqhFG9zxcJmfgj6vgoZ9MdO5wFw N05aCtdgOSQe1N7IBEIfasa+mcpBlJSyq2BxsBOZlobwNJ2507Aw34R8yTvpKJsSouTD +QadlfhhcImrHk1TPVa2v6XPKsd/ReHWOUv2b4gORXWgGwJ5AJw5Jvl3H4NXT4WB/ldv 0wA2gesJD5m0J9p6AXsFg3MR7RGNKFUeMsCGT7v1UPdW7zZc8u5apR9nj2TZ4Z7I34Qn 4TUA== 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=Hx+w/5BxM5r+c6606vkAnMaahesU+UJ9ZVtu1lRAkR8=; b=ONyeWjZ9LhBNBbh2sEErasi9qXfmlC7aKlskvly78JUsKAeJ5x8LQLRNLOKqKzNjqp z5010eEy71AU7/WG9E9ht6dNmSA+rKOCO+g44Q0m0Gknh7K1bXRDUIEmM2CvSMP9ZEsK 1ma8ye2NurIoDQa/D4M9QpozJ34XSxMtPPSkxsefL3QAbAGtMsbX6gu9VaaiLM/6Ps7y dz7LKe8CcxMV9nctoQo0JfGjGGg4j1d0aTtNLW0RORKQc7KSr79oZhY6CxhrDGoUpaUp PziLMptI12lDnhcGF3ArgHrvfMyuRFWwre6JPUrlG0aXZqGfzpVXzjAU8v0RKgWWrL8T viKQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=c93Xtwvb; 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 dp17-20020a170906c15100b006f3d82ce68esi21216957ejc.145.2022.07.19.09.57.31; Tue, 19 Jul 2022 09:57:32 -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=c93Xtwvb; 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 E482D68B70E; Tue, 19 Jul 2022 19:57:02 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f43.google.com (mail-wm1-f43.google.com [209.85.128.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 67B8668B6F9 for ; Tue, 19 Jul 2022 19:57:00 +0300 (EEST) Received: by mail-wm1-f43.google.com with SMTP id ay11-20020a05600c1e0b00b003a3013da120so10408352wmb.5 for ; Tue, 19 Jul 2022 09:57:00 -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=D+cwfkj3FyHmCse3ahY4CIezdr+uKa0BE8y8V5Ed0kU=; b=c93XtwvbFR3frUnB7G872F+OHOIQdeciuCzUV2sYLHkeuo8dqxHt7nQY5+pS8JM8fR lriVXecSnXiuigWSjTeQphIuyhnSyNNum8PmdtPqjdPoahZP8O/64OlpieQQIyd7GOfP T+aTbyEw5VlSnO94mliF+3AiFxuZuuNnVZFlOsXKPtvBd3nadBgBMX4CaiK9NcDshQMi SiKgvzaMTISDFj8bvq1Y9xwOFBUSHXLKYJzGFnqJRQHVozHxFQNkMhVL9XifF4JARd68 hhtoKvmy+LNyHZZbmfBtNMU1Wbtj1Gp+6E7j0rHsqu8qGrAIdoAy13Th4XB+tBzxwPv3 EXqA== 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=D+cwfkj3FyHmCse3ahY4CIezdr+uKa0BE8y8V5Ed0kU=; b=nASgIM4Jd3n7nplK/QdFdZsOTYb0KKop0Dl9gZ5WhXU+X2pSfMrR5ozHvYIXg4NViE SPOba/NUmaTJP7WZb72XtSHuc47TXlR0HI1Jvnq/9LK439ORL94gApw/i+QUKBq9pffr FEwVWvUmIhk7zUakveqsaeFiHY+XlZXkW7HeOvoNrO7cq/if7O2UbayTl8yaOSQR2wq1 6Nz7oBQDT/A86WdGO/kF6r0DLlFioVyPzaXlJzYAHPP0zkuAcGKHm/QPAH7IHVzajdLn nmWc7G38hpPHKqLomEK225XmEhwrfSPEzAShRkqqIEbYdLM69ZKIcHQSK64Ts5PY/yOx cwjA== X-Gm-Message-State: AJIora+qSdZ7wcbM7mevTX35r60A6SYZ78kgT0gqdn+9+bboadhF+v7Y BDA9wCWUPNlpDMgeU1zzq72iE9uPG5Y6Cw== X-Received: by 2002:a05:600c:3b91:b0:3a3:1cbe:d531 with SMTP id n17-20020a05600c3b9100b003a31cbed531mr202266wms.159.1658249819434; Tue, 19 Jul 2022 09:56:59 -0700 (PDT) Received: from localhost ([2a00:5f00:102:0:ed02:7072:7dbf:2431]) by smtp.gmail.com with UTF8SMTPSA id bd20-20020a05600c1f1400b003a3211112f8sm3833068wmb.46.2022.07.19.09.56.58 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 19 Jul 2022 09:56:59 -0700 (PDT) From: Emil Velikov To: ffmpeg-devel@ffmpeg.org Date: Tue, 19 Jul 2022 17:56:56 +0100 Message-Id: <20220719165656.640869-4-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 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: qmNB4vGgQgS7 From: Emil Velikov Similar to the VAAPI_X11 bits, guard all the VAAPI_DRM parts behind an disabled. Cc: Mark Thompson 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;