From patchwork Thu Feb 15 19:17:53 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Jan_Ekstr=C3=B6m?= X-Patchwork-Id: 46296 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:b819:b0:19e:cdac:8cce with SMTP id fi25csp812375pzb; Thu, 15 Feb 2024 11:18:15 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCXw2YI/FiOseGrutU2zIo9B4M3rfZob2I4Wmn3DEtFfrJ9yq18bguu2ATO0d1lp7XGiDboEDVbZl9YX5Iocd732FlKb3uwmKkXigQ== X-Google-Smtp-Source: AGHT+IGgHnWvPuUYAw4NZoHELPUtjg7lk9D7e6icPutYmGIfxDe7+AXO58FYYk06h2qayp97A45v X-Received: by 2002:a17:907:7848:b0:a3b:b215:6edb with SMTP id lb8-20020a170907784800b00a3bb2156edbmr1780642ejc.6.1708024695300; Thu, 15 Feb 2024 11:18:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1708024695; cv=none; d=google.com; s=arc-20160816; b=TQlbkdnH4iA0ExKURUt1A0YHuqH/96NXDgLrI3VhLgcF+wQZ46H++US1x05R1QQOIv WusYQ/Q9gfkX/pwhCjbPnLkFTa7piC5TpccvmcCY0yrxDVXQlvzIKA+h58VmoglAHIVa bd4Y2KK/CyqZG/jjpkmQ0lBtghEi+ek/UrMRVe6OLqE9anexQ8ishcnHYNmjjCfzMLgC VjuJIYSz9OHTdT05umaWsvJI1EyjCp35Vyd31bQPHvI9yvonPGH0LByyOJILuYNM0Wul 35Kxy+f16sdUcCW//6fJl6gLlpZrw06/JPKm0OuoV7IQd+Bbkl5rn1SgyfEXyEjAzDjJ IcmQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding: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=BTu4qDQ5C8Z/0lumWYQ42630y5YslNXsQWRPoKL7sN8=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=W5GbAI0t2firUuU1bOuhwzHJ5TOBkS6ImweFuUce1St4ebZWP1oAvXOcewFThPXLLn PuAsvyLANy054TDVPQjkMFpYPVuQj2W330bs/d6JVs9Zc7934tdR4c4YyDoAIHtII17t eeedgQLBYpCBMFe7Jz9ZzMuF/NqmOE+Bqi8B73rxHI5hNE64e2DX3oVBfrPivCyKp+yN 6QFja0HB5rPgkAyuZIYVpSEXU451Hivn3XTlKm33Bae4QDsirrGdxTHRFfVZi5EyOzx2 Dz3ECilJn+ggC4+yFDkE4u8Z8uEyFAwZD5Kqiks2dOLhvzCckmGEpPSeN8L3KFGjfMvG SXxw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=hUkcLhHJ; 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 y18-20020a1709060a9200b00a3d310a2683si860144ejf.663.2024.02.15.11.18.14; Thu, 15 Feb 2024 11:18:15 -0800 (PST) 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=20230601 header.b=hUkcLhHJ; 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 2B83E68D282; Thu, 15 Feb 2024 21:18:11 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lj1-f169.google.com (mail-lj1-f169.google.com [209.85.208.169]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7425C68D257 for ; Thu, 15 Feb 2024 21:18:04 +0200 (EET) Received: by mail-lj1-f169.google.com with SMTP id 38308e7fff4ca-2d10d2da73dso16655911fa.1 for ; Thu, 15 Feb 2024 11:18:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1708024683; x=1708629483; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=Gkt60TQDTRosVsENhEfGKItffDs6ZBaZztK6tO0xzuw=; b=hUkcLhHJuDd6XpK4SOAeHtN/XS/t+xVa7+EqSjYCcED+ULbvtxqbz2l8ugx456bLQ2 a4UojIZ2UwP2qfARB7E6puvr3Eg1uVzkrCv+pHhtiv9U6Tmcg8I44ntTw2XYZuQ0hEOv yRnnOSdSPHJlJYmT+XlxrXLNP4GbmROuetxLbYnbdgs8VXyYQTk0lQtSm8efu4Zk5/4W L/6R1qeIa+Dq0DE+Fg3P27Wl8/+5vOnnes81HpJg1kYWrDUVc5e7XpGJmDDJ35yizJCD 8h7U3i+fgM21oa0bKUKM+0hfrMiHvHfVO8tCAeFbo0OercWkG9hWhYD4VtIMlApJBn25 OyiQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708024683; x=1708629483; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=Gkt60TQDTRosVsENhEfGKItffDs6ZBaZztK6tO0xzuw=; b=JzIm22okAOHIiEEwzdVisHOoYuiEx0fFVNprcMbv/Y7NQq7O3GqKPmgt3spqDKQXRZ wGCY/2es0N0ATzCniWUnEWfca7mytiUV6ivi626o+t8ZfWLUmLe5aTvBGqNNBAoFzHKT Au9BbWzzoVKb1Bua2wt/JtwmCyyBwylDh/9ugn6W061cx3RrQqmyF6RIOFpDYy55RCJ6 c8/Kz9A3EXydSKi3L+TclZJetP8b/So8gWmbPbL2M9svGf0sQFPlt3Z7vWms/NAt/OfU Aye06xTJ0w02ytxlizyWDl5uTZb2wwNBvbJAd9A8V+lV1nNrbxPGNDPxM4qvUbt4v4K5 ydKA== X-Gm-Message-State: AOJu0Yx6X80GKRtO7D+foHJ7uc+aOrfJWHiWa5bFv9ZMArwXlPi0GoJJ 3+TczZx3eZmJYnKsnF1ziPgj2/Mc0i7NiHTsZGMW64W95qk4vIeVcXZIUZl/ X-Received: by 2002:a05:6512:280b:b0:511:ab2a:4af1 with SMTP id cf11-20020a056512280b00b00511ab2a4af1mr3504836lfb.13.1708024683221; Thu, 15 Feb 2024 11:18:03 -0800 (PST) Received: from localhost.localdomain (91-153-198-187.elisa-laajakaista.fi. [91.153.198.187]) by smtp.gmail.com with ESMTPSA id z9-20020ac24189000000b0051244c90560sm352376lfh.1.2024.02.15.11.18.02 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Feb 2024 11:18:02 -0800 (PST) From: =?utf-8?q?Jan_Ekstr=C3=B6m?= To: ffmpeg-devel@ffmpeg.org Date: Thu, 15 Feb 2024 21:17:53 +0200 Message-ID: <20240215191757.336042-1-jeebjp@gmail.com> X-Mailer: git-send-email 2.43.1 MIME-Version: 1.0 Subject: [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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: UfCRxwZD+T1O 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: