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;