From patchwork Tue Jul 5 00:11:01 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niklas Haas X-Patchwork-Id: 36667 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:8b27:b0:88:1bbf:7fd2 with SMTP id l39csp3140974pzh; Mon, 4 Jul 2022 17:11:17 -0700 (PDT) X-Google-Smtp-Source: AGRyM1sXsUW+R2LkjMSjJZ8ALCa2KcTGVmbEIaF7P7yR36UXDss5Co40pQHYls0IoXwKsFEsBlcd X-Received: by 2002:a17:906:216:b0:711:f623:8bb0 with SMTP id 22-20020a170906021600b00711f6238bb0mr32384338ejd.174.1656979877211; Mon, 04 Jul 2022 17:11:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1656979877; cv=none; d=google.com; s=arc-20160816; b=K4H4BEF8DALwHJa6If+UFNDPVbBQ4YEuQPGD3RQX9sRrRJ4Lr9jTwN6u4aVNAJTDaZ AJnjfszhZg1gBe2tNdG2J4a0xsUFMG9Ncy90pCLB4Kp8jN+WYGbcsJWJuxJxuQA13d0d Q+GgrzbB2TCdNC97FtUqbzlMO8SRZL0ai1yqQT17cs4jJ0y002iyYheSTS2YVhjj7xAa OEP1Gb1Iiaw7wWrd8in43W0Whvf/DjcqkumNmilkWmIf+HhKadwGMJ7MxRHgKPeQsE/n BqJS/8DOuW0rbFwh/wJunUpy7yw/h0PeY2wHO6H2RUly+1I/7e2oFHA/+ociiMq752HX FKsA== 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:message-id:date:to:from :dkim-signature:delivered-to; bh=ql6rWIc57e7tpfKRTeIb3nVkDqnERMvCMDh1Mp67CRA=; b=qVwt5mRjleInZ9H/HCj4oEQ6ZpHoepP4rzBveMOm1IAM8yxufK+oZifIfYknluUhQ4 CDpVMkTZ0ceeaO+l9MFroWU4e2NP11+FV4a45DUPrfCK/xqn6D5xjn/ivT9Cekl8M4dC fQSOhFGr2goLvKLgxvtcijFruly1VKo0K8VHbwHoslwG/vtI2IKrI6hCHsz5/eNvO30L J8B7KOnjI/y+4B1plQ5hGAguDIsfaluguRPEkiI/6noTpmYVKxRW+TaYCuUcxNiJR7V7 l+smHc8sKQgZwzORBeLF07bbXxvmg00Uhizezd3CpxLxA4zRwHIy2vR+09RDieZFJMPd tdXA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@haasn.xyz header.s=mail header.b=KTMJ+M2+; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id du13-20020a17090772cd00b00706fe017e89si16206976ejc.880.2022.07.04.17.11.16; Mon, 04 Jul 2022 17:11: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=@haasn.xyz header.s=mail header.b=KTMJ+M2+; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 402CE68B916; Tue, 5 Jul 2022 03:11:13 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from haasn.dev (haasn.dev [78.46.187.166]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6396468B7E8 for ; Tue, 5 Jul 2022 03:11:06 +0300 (EEST) Received: from haasn.dev (unknown [10.30.0.2]) by haasn.dev (Postfix) with ESMTP id D7ED84A5A8; Tue, 5 Jul 2022 02:11:05 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=haasn.xyz; s=mail; t=1656979865; bh=jmen2QjqP/TPNTd6GY3KILFGAvS1hrWe2ABznJcOAB4=; h=From:To:Cc:Subject:Date:From; b=KTMJ+M2+0BaILHXp31cjAQkSW+00T60nekMxLUlO1n/a7zbJkJ0ZBaS0s8JKLx9F1 JZ8UZQ+wxIYku15FSBC+gBMO8WIzHI2V/aKJKz1NIWOkJk9rEhQwZ4893OKXr2rqLX vriAyci4FwMtgZhlplwqDggI4WaZ+KWksyola2xY= From: Niklas Haas To: ffmpeg-devel@ffmpeg.org Date: Tue, 5 Jul 2022 02:11:01 +0200 Message-Id: <20220705001101.111869-1-ffmpeg@haasn.xyz> X-Mailer: git-send-email 2.36.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] lavu: always provide symbols from hwcontext_vulkan.h 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: Niklas Haas Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: IqfdieqHyuI4 From: Niklas Haas This header is unconditionally installed, even though the utility functions defined by it may be missing from the built library. A precedent set by e.g. libavcodec/qsv.h (and others) is to always provide these functions by compiling stub functions in the absence of CONFIG_*. Make hwcontext_vulkan.h match this convention. Fixes downstream issues, e.g. https://github.com/haasn/libplacebo/issues/120 Signed-off-by: Niklas Haas --- libavutil/Makefile | 2 +- libavutil/hwcontext_vulkan.c | 26 ++++++++++++++++++++++++-- 2 files changed, 25 insertions(+), 3 deletions(-) diff --git a/libavutil/Makefile b/libavutil/Makefile index 29c170214c..66017a33a2 100644 --- a/libavutil/Makefile +++ b/libavutil/Makefile @@ -136,6 +136,7 @@ OBJS = adler32.o \ hdr_dynamic_vivid_metadata.o \ hmac.o \ hwcontext.o \ + hwcontext_vulkan.o \ imgutils.o \ integer.o \ intmath.o \ @@ -194,7 +195,6 @@ OBJS-$(CONFIG_QSV) += hwcontext_qsv.o OBJS-$(CONFIG_VAAPI) += hwcontext_vaapi.o OBJS-$(CONFIG_VIDEOTOOLBOX) += hwcontext_videotoolbox.o OBJS-$(CONFIG_VDPAU) += hwcontext_vdpau.o -OBJS-$(CONFIG_VULKAN) += hwcontext_vulkan.o OBJS += $(COMPAT_OBJS:%=../compat/%) diff --git a/libavutil/hwcontext_vulkan.c b/libavutil/hwcontext_vulkan.c index 237caa4bc0..f7944a321c 100644 --- a/libavutil/hwcontext_vulkan.c +++ b/libavutil/hwcontext_vulkan.c @@ -16,6 +16,13 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include + +#include "config.h" +#include "pixdesc.h" + +#if CONFIG_VULKAN + #define VK_NO_PROTOTYPES #define VK_ENABLE_BETA_EXTENSIONS @@ -29,8 +36,6 @@ #include -#include "config.h" -#include "pixdesc.h" #include "avstring.h" #include "imgutils.h" #include "hwcontext.h" @@ -4161,3 +4166,20 @@ const HWContextType ff_hwcontext_type_vulkan = { AV_PIX_FMT_NONE }, }; + +#else /* !CONFIG_VULKAN */ + +struct AVVkFrame *av_vk_frame_alloc(void); +const enum VkFormat *av_vkfmt_from_pixfmt(enum AVPixelFormat p); + +struct AVVkFrame *av_vk_frame_alloc(void) +{ + return NULL; +} + +const enum VkFormat *av_vkfmt_from_pixfmt(enum AVPixelFormat p) +{ + return NULL; +} + +#endif