From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id C876847CAB for ; Thu, 15 Feb 2024 19:21:05 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4E2A468D286; Thu, 15 Feb 2024 21:21:03 +0200 (EET) Received: from w4.tutanota.de (w4.tutanota.de [81.3.6.165]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 636E168D131 for ; Thu, 15 Feb 2024 21:20:57 +0200 (EET) Received: from tutadb.w10.tutanota.de (unknown [192.168.1.10]) by w4.tutanota.de (Postfix) with ESMTP id F3EA61060271 for ; Thu, 15 Feb 2024 19:20:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1708024856; s=s1; d=lynne.ee; h=From:From:To:To:Subject:Subject:Content-Description:Content-ID:Content-Type:Content-Type:Content-Transfer-Encoding:Content-Transfer-Encoding:Cc:Date:Date:In-Reply-To:In-Reply-To:MIME-Version:MIME-Version:Message-ID:Message-ID:Reply-To:References:References:Sender; bh=jfhzRVQGDBcWHUt6xpye53nO4kbKgza6ijDEK4NlOF8=; b=iLZfIggsG//wjJmwEC2v4Cr15KhAonTt6teoWu0+W1eZseAHpZjKsoAgYopIo86B pDCilvWvSTqBkavRoAa2IpdU43cOxVfERbyDkfws1Vy6bXEN58HI2nRGtipZJE/na32 zPHY/wstha4K5+qwOY7218tgZsM+w6+Qj4+sRzaygbWIjOMA7XPkSzJaHFwA57MV9oA Oc1QSKWRlvHVzrR9Xv49m5dFzoLwy7+3mwJnPCvEXJw2p3SudCJOsBRqdNaCqpQ3A8l q71CMoac9ednZ9NJQC7X+mD3QZradpMD/6LUREdmtRk4jS+pbGIAo8YEKT+X7IuDsPa f9hJBH9v1w== Date: Thu, 15 Feb 2024 20:20:56 +0100 (CET) From: Lynne To: FFmpeg development discussions and patches Message-ID: In-Reply-To: <20240215191757.336042-1-jeebjp@gmail.com> References: <20240215191757.336042-1-jeebjp@gmail.com> MIME-Version: 1.0 Subject: Re: [FFmpeg-devel] [PATCH v2] {avcodec, tests}: rename the bundled Mesa AV1 vulkan video headers 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Feb 15, 2024, 20:18 by jeebjp@gmail.com: > This together with adjusting the inclusion define allows for the > build to not fail with latest Vulkan-Headers that contain the > stabilized Vulkan AV1 decoding definitions. > > Compilation fails currently as the AV1 header is getting included > via hwcontext_vulkan.h -> -> vulkan_core.h, which > finally includes vk_video/vulkan_video_codec_av1std.h and the decode > header, leading to the bundled header to never defining anything > due to the inclusion define being the same. > > This fix is imperfect, as it leads to additional re-definition > warnings for things such as > VK_STD_VULKAN_VIDEO_CODEC_AV1_DECODE_SPEC_VERSION. , but it is > not clear how to otherwise have the bundled version trump the > actually standardized one for a short-term compilation fix. > --- > libavcodec/Makefile | 4 ++-- > libavcodec/vulkan_video.h | 4 ++-- > ...v1std_decode.h => vulkan_video_codec_av1std_decode_mesa.h} | 4 ++-- > ..._video_codec_av1std.h => vulkan_video_codec_av1std_mesa.h} | 4 ++-- > tests/ref/fate/source | 4 ++-- > 5 files changed, 10 insertions(+), 10 deletions(-) > rename libavcodec/{vulkan_video_codec_av1std_decode.h => vulkan_video_codec_av1std_decode_mesa.h} (89%) > rename libavcodec/{vulkan_video_codec_av1std.h => vulkan_video_codec_av1std_mesa.h} (99%) > > diff --git a/libavcodec/Makefile b/libavcodec/Makefile > index 470d7cb9b1..09ae5270b3 100644 > --- a/libavcodec/Makefile > +++ b/libavcodec/Makefile > @@ -1262,7 +1262,7 @@ SKIPHEADERS += %_tablegen.h \ > aacenc_quantization.h \ > aacenc_quantization_misc.h \ > bitstream_template.h \ > - vulkan_video_codec_av1std.h \ > + vulkan_video_codec_av1std_mesa.h \ > $(ARCH)/vpx_arith.h \ > > SKIPHEADERS-$(CONFIG_AMF) += amfenc.h > @@ -1285,7 +1285,7 @@ SKIPHEADERS-$(CONFIG_XVMC) += xvmc.h > SKIPHEADERS-$(CONFIG_VAAPI) += vaapi_decode.h vaapi_hevc.h vaapi_encode.h > SKIPHEADERS-$(CONFIG_VDPAU) += vdpau.h vdpau_internal.h > SKIPHEADERS-$(CONFIG_VIDEOTOOLBOX) += videotoolbox.h vt_internal.h > -SKIPHEADERS-$(CONFIG_VULKAN) += vulkan.h vulkan_video.h vulkan_decode.h vulkan_video_codec_av1std_decode.h > +SKIPHEADERS-$(CONFIG_VULKAN) += vulkan.h vulkan_video.h vulkan_decode.h vulkan_video_codec_av1std_decode_mesa.h > SKIPHEADERS-$(CONFIG_V4L2_M2M) += v4l2_buffers.h v4l2_context.h v4l2_m2m.h > SKIPHEADERS-$(CONFIG_ZLIB) += zlib_wrapper.h > > diff --git a/libavcodec/vulkan_video.h b/libavcodec/vulkan_video.h > index b28e3fe0bd..51f44dd543 100644 > --- a/libavcodec/vulkan_video.h > +++ b/libavcodec/vulkan_video.h > @@ -23,8 +23,8 @@ > #include "vulkan.h" > > #include > -#include "vulkan_video_codec_av1std.h" > -#include "vulkan_video_codec_av1std_decode.h" > +#include "vulkan_video_codec_av1std_mesa.h" > +#include "vulkan_video_codec_av1std_decode_mesa.h" > > #define CODEC_VER_MAJ(ver) (ver >> 22) > #define CODEC_VER_MIN(ver) ((ver >> 12) & ((1 << 10) - 1)) > diff --git a/libavcodec/vulkan_video_codec_av1std_decode.h b/libavcodec/vulkan_video_codec_av1std_decode_mesa.h > similarity index 89% > rename from libavcodec/vulkan_video_codec_av1std_decode.h > rename to libavcodec/vulkan_video_codec_av1std_decode_mesa.h > index a697c00593..e2f37b4e6e 100644 > --- a/libavcodec/vulkan_video_codec_av1std_decode.h > +++ b/libavcodec/vulkan_video_codec_av1std_decode_mesa.h > @@ -14,8 +14,8 @@ > * limitations under the License. > */ > > -#ifndef VULKAN_VIDEO_CODEC_AV1STD_DECODE_H_ > -#define VULKAN_VIDEO_CODEC_AV1STD_DECODE_H_ 1 > +#ifndef VULKAN_VIDEO_CODEC_AV1STD_DECODE_MESA_H_ > +#define VULKAN_VIDEO_CODEC_AV1STD_DECODE_MESA_H_ 1 > > /* > ** This header is NOT YET generated from the Khronos Vulkan XML API Registry. > diff --git a/libavcodec/vulkan_video_codec_av1std.h b/libavcodec/vulkan_video_codec_av1std_mesa.h > similarity index 99% > rename from libavcodec/vulkan_video_codec_av1std.h > rename to libavcodec/vulkan_video_codec_av1std_mesa.h > index c46236c457..c91589eee2 100644 > --- a/libavcodec/vulkan_video_codec_av1std.h > +++ b/libavcodec/vulkan_video_codec_av1std_mesa.h > @@ -14,8 +14,8 @@ > * limitations under the License. > */ > > -#ifndef VULKAN_VIDEO_CODEC_AV1STD_H_ > -#define VULKAN_VIDEO_CODEC_AV1STD_H_ 1 > +#ifndef VULKAN_VIDEO_CODEC_AV1STD_MESA_H_ > +#define VULKAN_VIDEO_CODEC_AV1STD_MESA_H_ 1 > > /* > ** This header is NOT YET generated from the Khronos Vulkan XML API Registry. > diff --git a/tests/ref/fate/source b/tests/ref/fate/source > index c575789dd5..8bb58b61f1 100644 > --- a/tests/ref/fate/source > +++ b/tests/ref/fate/source > @@ -23,8 +23,8 @@ compat/djgpp/math.h > compat/float/float.h > compat/float/limits.h > libavcodec/bitstream_template.h > -libavcodec/vulkan_video_codec_av1std.h > -libavcodec/vulkan_video_codec_av1std_decode.h > +libavcodec/vulkan_video_codec_av1std_decode_mesa.h > +libavcodec/vulkan_video_codec_av1std_mesa.h > tools/decode_simple.h > Use of av_clip() where av_clip_uintp2() could be used: > Use of av_clip() where av_clip_intp2() could be used: > LGTM _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".