From patchwork Tue Jul 19 16:56:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Emil Velikov X-Patchwork-Id: 36845 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:1649:b0:8b:613a:194d with SMTP id no9csp1878710pzb; Tue, 19 Jul 2022 09:56:37 -0700 (PDT) X-Google-Smtp-Source: AGRyM1vmLmXg0lqaHiGuXbGnEZSpWZTok6eiEo9qhOZqQpSNDmI/amHPGmNB2mIVGdMpeRrTV2uG X-Received: by 2002:a05:6402:5cb:b0:434:eb48:754f with SMTP id n11-20020a05640205cb00b00434eb48754fmr45659452edx.421.1658249796896; Tue, 19 Jul 2022 09:56:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1658249796; cv=none; d=google.com; s=arc-20160816; b=Q6s4LIeP8aQ6FSUaIc2sZaH719HR99Rf0pDKl4JUeF26hbZB+cJ2DftlUTOouTyfkW 9c5TLyQ+aqgTHkD8YY9Jk4wIhC278WPXuMRT9C6fFbEihrkn07poKONypxaSKsGPGnRs jd57t6m39cTZ40ruNxJgNtELYXNT+u6Kj8WzyvXeGGRoMCKDs17OWHW6g3Mz69h5FYGw xBqx8kEFRZH0RUEEVaf/GwEUeAjM8Vu9IevnkjbIvLWdIAPwFcuef8g+LVg4nt6u9omN aIr44ppFAgjEAzQ2gJSmhJGL/tsLJrIJMb01TDRBKC2q3yGMYqWwH8Cl3fBn9SjS7uEZ iq5Q== 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=pREn6wz1JsIzO6V7jqNqUZDVx6d0A8DHIpLzfUax+3wHJTl1Q7pmJaurH21llz88/I Ir7VIfdY+lCUbCc3iYoztiHOjjyXbWwjPjlT+dK8vXe8JFGN157Ag7UK4gU0N7EcvwW1 c578B+7JVh5bYZ/7CgAaX1VThjp3PQKx5p423ZJyL+sktzlcHvuXudqZ74ftLxE3jqT2 ezmZvbAwjpE9lc6nc6DEWUJ6swWSMckUt6dNBgzWMLeCO9Rg7+Eco/iUKObezPoqk4tS iw35LYxg9D4o6ICXxZXvzcXaJ627qqNwaZae/dLIGy5/WBewN6W77Tlpax8e8t43SZ1Y qHlw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b="egocP9F/"; 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 j25-20020a170906095900b00722e3529906si17233103ejd.324.2022.07.19.09.56.35; Tue, 19 Jul 2022 09:56:36 -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="egocP9F/"; 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 D14C968B63E; Tue, 19 Jul 2022 19:56:15 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5A39D68B61E for ; Tue, 19 Jul 2022 19:56:08 +0300 (EEST) Received: by mail-wr1-f49.google.com with SMTP id z12so22526065wrq.7 for ; Tue, 19 Jul 2022 09:56:08 -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=egocP9F/Izh4YVy073jGJp1oklDIvEixM1f/XQZtEXSRZgP5A79UOpdoD2I3Zc2hJj UPeGm8lTsWXZd1h1BpU5dkPR8DaWt45vClYnOSUOR/H0MEyaJdRddVtNtxDIGcC9+Yz4 vWJnd51Hz4PW025skC4emgC0+psOXDXcgz4nC6HltesA3whl6adeezXpMFvLPDmsgC3u UD5/gZL0fTZKfLdjr3lOhis7074ZdshyIxRYCEy8/av/R0n501TK0JmICYngKajG4xFH Dq2/4jq+OcvhxkwzXE8msr20mcpEQ56efJHazLVyD5KhVFB1s6pHunSFMJU6980f6hGp Dk5g== 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=x8hVgbgXsT2yhCp/Z2/BPoTTqvBEOZD2ztDT4L4bW8cxTTOp8u5bfu+MAv4xOWkqBI zveZbE8n1O36tHPqkO7bq/ouuLtPrPahl9FwUaCzBWu01/FGcACFSK+JhqZdkuQ5+prW /ciPS8H11uxzOmqNMsyyFcpl8Ys5Ro9G2zJK4P7T4U5NH3DJEfd5y0zzbxZtbOzC6fkm Chv9YuY2edzXJ7523SWHJAXn1yWpwN4YgSU+Kkc3Md0FUGncrFrH7f/wGs+o/SEJe+69 lDgt3/vOwzub6kgdFwUUq1yqAzHG0X8BTD0I7UOoZ+/1Ed7AavNCrNRyEZ9FSoWvUh7O LlXQ== X-Gm-Message-State: AJIora/9l9Kz1nslk02NeV+v2qR5rB3CgnzE9dGgoQWtXZVB2FkBHtQb mfU7/9OI7aMamkD1i55zAYmX+dSADor0vw== X-Received: by 2002:a05:6000:1686:b0:21d:6e46:2fa with SMTP id y6-20020a056000168600b0021d6e4602famr27307613wrd.691.1658249767413; Tue, 19 Jul 2022 09:56:07 -0700 (PDT) Received: from localhost ([2a00:5f00:102:0:ed02:7072:7dbf:2431]) by smtp.gmail.com with UTF8SMTPSA id p17-20020adff211000000b0021d9207e6f1sm13699055wro.34.2022.07.19.09.56.06 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 19 Jul 2022 09:56:07 -0700 (PDT) From: Emil Velikov To: ffmpeg-devel@ffmpeg.org Date: Tue, 19 Jul 2022 17:56:04 +0100 Message-Id: <20220719165604.640770-3-emil.l.velikov@gmail.com> X-Mailer: git-send-email 2.37.0 In-Reply-To: <20220719165604.640770-1-emil.l.velikov@gmail.com> References: <20220719165604.640770-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: /3YvIK7rixvY 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;