From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.ffmpeg.org (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id 265B84CC20 for ; Fri, 8 Aug 2025 15:04:16 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 99C0A68CC5E; Fri, 8 Aug 2025 18:04:12 +0300 (EEST) Received: from 0f9ae49ae7c8 (code.ffmpeg.org [188.245.149.3]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id 532006806D4 for ; Fri, 8 Aug 2025 18:04:11 +0300 (EEST) MIME-Version: 1.0 From: James Almer To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] =?utf-8?q?=5BPATCH=5D_Assorted_Vulkan_fixes_=28PR?= =?utf-8?q?_=2320179=29?= 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" Message-Id: <20250808150412.99C0A68CC5E@ffbox0-bg.ffmpeg.org> Date: Fri, 8 Aug 2025 18:04:12 +0300 (EEST) Archived-At: List-Archive: List-Post: PR #20179 opened by James Almer (jamrial) URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20179 Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20179.patch >From 4f255ce62431eb70545beebb1ff0fcb818909f97 Mon Sep 17 00:00:00 2001 From: James Almer Date: Fri, 8 Aug 2025 12:00:10 -0300 Subject: [PATCH 1/3] avcodec/vulkan_encode_av1: remove unused variables Signed-off-by: James Almer --- libavcodec/vulkan_encode_av1.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/libavcodec/vulkan_encode_av1.c b/libavcodec/vulkan_encode_av1.c index 51f4d284c1..6e3bcefd4a 100644 --- a/libavcodec/vulkan_encode_av1.c +++ b/libavcodec/vulkan_encode_av1.c @@ -180,15 +180,11 @@ static int init_pic_params(AVCodecContext *avctx, FFHWBaseEncodePicture *pic, FFVulkanEncodeContext *ctx = &enc->common; FFHWBaseEncodeContext *base_ctx = &ctx->base; - FFVulkanEncodePicture *vp = pic->priv; VulkanEncodeAV1Picture *ap = pic->codec_priv; FFHWBaseEncodePicture *ref; VulkanEncodeAV1Picture *ap_ref; VkVideoReferenceSlotInfoKHR *ref_slot; - AV1RawOBU *seq_obu = &enc->seq_hdr_obu; - AV1RawSequenceHeader *seq = &seq_obu->obu.sequence_header; - uint32_t ref_name_mask = 0x0; int name_slots[STD_VIDEO_AV1_REFS_PER_FRAME]; @@ -703,7 +699,6 @@ static int init_enc_options(AVCodecContext *avctx) static av_cold int init_sequence_headers(AVCodecContext *avctx) { - int err; VulkanEncodeAV1Context *enc = avctx->priv_data; FFVulkanEncodeContext *ctx = &enc->common; FFVulkanContext *s = &ctx->s; @@ -1167,7 +1162,6 @@ static av_cold int vulkan_encode_av1_init(AVCodecContext *avctx) int err; VulkanEncodeAV1Context *enc = avctx->priv_data; FFVulkanEncodeContext *ctx = &enc->common; - FFVulkanContext *s = &ctx->s; FFHWBaseEncodeContext *base_ctx = &ctx->base; int flags; -- 2.49.1 >From a2821f3d6024add7795625ae749b8e967dc4a4f8 Mon Sep 17 00:00:00 2001 From: James Almer Date: Fri, 8 Aug 2025 12:00:52 -0300 Subject: [PATCH 2/3] avcodec/vulkan_encode_av1: use size_t specifier in an av_log() call Signed-off-by: James Almer --- libavcodec/vulkan_encode_av1.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/vulkan_encode_av1.c b/libavcodec/vulkan_encode_av1.c index 6e3bcefd4a..e78b6d271e 100644 --- a/libavcodec/vulkan_encode_av1.c +++ b/libavcodec/vulkan_encode_av1.c @@ -982,7 +982,7 @@ static int init_base_units(AVCodecContext *avctx) if (!data) return AVERROR(ENOMEM); } else { - av_log(avctx, AV_LOG_ERROR, "Unable to get feedback for AV1 sequence header = %lu\n", + av_log(avctx, AV_LOG_ERROR, "Unable to get feedback for AV1 sequence header = %"SIZE_SPECIFIER"\n", data_size); return err; } -- 2.49.1 >From 3b10425af59a53df57dccd6898e1514f465c6db0 Mon Sep 17 00:00:00 2001 From: James Almer Date: Fri, 8 Aug 2025 12:02:51 -0300 Subject: [PATCH 3/3] avutil/hwcontext_vulkan: use uint64_t specifier in an av_log() call Signed-off-by: James Almer --- libavutil/hwcontext_vulkan.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavutil/hwcontext_vulkan.c b/libavutil/hwcontext_vulkan.c index bda24c4719..c8e1b7e576 100644 --- a/libavutil/hwcontext_vulkan.c +++ b/libavutil/hwcontext_vulkan.c @@ -3037,7 +3037,7 @@ static int vulkan_frames_init(AVHWFramesContext *hwfc) } if (mod_props == NULL) { - av_log(hwfc, AV_LOG_ERROR, "No DRM format modifier properties found for modifier 0x%016lx\n", + av_log(hwfc, AV_LOG_ERROR, "No DRM format modifier properties found for modifier 0x%016"PRIx64"\n", drm_mod.drmFormatModifier); av_free(modp.pDrmFormatModifierProperties); vulkan_frame_free(hwfc, f); -- 2.49.1 _______________________________________________ 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".