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 87AD44E967 for ; Sat, 12 Jul 2025 18:52:39 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id BC36968F1FE; Sat, 12 Jul 2025 21:51:56 +0300 (EEST) Received: from vidala.pars.ee (vidala.pars.ee [116.203.72.101]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id 782E968F1CE for ; Sat, 12 Jul 2025 21:51:48 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; s=202405r; d=lynne.ee; c=relaxed/relaxed; h=Message-ID:Date:Subject:To:From; t=1752346308; bh=UhNs/WeavR8XoqmP77N53OK SE38AG3Zx259rmbxlSf8=; b=GjpF0ZRcP/SedaVhxn69Dt8wZFuZ/0/6RDKKzLggP5B5qJ0Lbo okXkljoHCaZCHbaCQ4xBQk2Zp7Fc971VGzsXlwmA/3e9lSkj1LXi6wdYXZnppxPKnKS3AiY465J HTPt/VAqvIir5iubTs/2xtYxAwmD9O5ZyRXMZFrJR7nXyytPbhFS5ct2P9nuy4H5iK2G3cq308G j7HIIUFOn0AgQlezTMH2y6m1TcI4vXRi1eRR0rF9pPHOoigVNfsiRf+D8I8Qq0iVrtfb9pt211p sW6fsCfMs1hWsKwI13bhKOFwsBQIMhhTW29mHZbP/jK3LeB8nHMHKbJ7pyshIlWCq+w==; DKIM-Signature: v=1; a=ed25519-sha256; s=202405e; d=lynne.ee; c=relaxed/relaxed; h=Message-ID:Date:Subject:To:From; t=1752346308; bh=UhNs/WeavR8XoqmP77N53OK SE38AG3Zx259rmbxlSf8=; b=rOf/GogcINWVlmlpHexy5Z6n+ye42pFFMW74swldMftrihmVyF ySQUhWUNndrsE7wrRNAhmW8JzdbYBV0/AYCw==; From: Lynne To: ffmpeg-devel@ffmpeg.org Date: Sun, 13 Jul 2025 03:51:14 +0900 Message-ID: <20250712185128.862167-5-dev@lynne.ee> X-Mailer: git-send-email 2.50.0 In-Reply-To: <20250712185128.862167-1-dev@lynne.ee> References: <20250712185128.862167-1-dev@lynne.ee> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 05/13] lavc/vulkan/common: sign-ify lengths 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: Lynne 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: This makes left_bits return useful data rather than overflowing, and also saves some 64-bit integer operations, which is still always a plus sadly. --- libavcodec/vulkan/common.comp | 22 +++++++++++----------- libavcodec/vulkan/ffv1_dec_setup.comp | 2 +- libavcodec/vulkan/ffv1_vlc.comp | 4 ++-- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/libavcodec/vulkan/common.comp b/libavcodec/vulkan/common.comp index 10af9c0623..6825693fa3 100644 --- a/libavcodec/vulkan/common.comp +++ b/libavcodec/vulkan/common.comp @@ -193,8 +193,8 @@ struct GetBitContext { uint64_t buf_end; uint64_t bits; - uint bits_valid; - uint size_in_bits; + int bits_valid; + int size_in_bits; }; #define LOAD64() \ @@ -216,11 +216,11 @@ struct GetBitContext { gb.bits_valid += 32; \ } -void init_get_bits(inout GetBitContext gb, u8buf data, uint64_t len) +void init_get_bits(inout GetBitContext gb, u8buf data, int len) { gb.buf = gb.buf_start = uint64_t(data); gb.buf_end = uint64_t(data) + len; - gb.size_in_bits = uint(len) * 8; + gb.size_in_bits = len * 8; /* Preload */ LOAD64() @@ -237,7 +237,7 @@ bool get_bit(inout GetBitContext gb) return val; } -uint get_bits(inout GetBitContext gb, uint n) +uint get_bits(inout GetBitContext gb, int n) { if (n == 0) return 0; @@ -251,7 +251,7 @@ uint get_bits(inout GetBitContext gb, uint n) return val; } -uint show_bits(inout GetBitContext gb, uint n) +uint show_bits(inout GetBitContext gb, int n) { if (n > gb.bits_valid) RELOAD32() @@ -259,7 +259,7 @@ uint show_bits(inout GetBitContext gb, uint n) return uint(gb.bits >> (64 - n)); } -void skip_bits(inout GetBitContext gb, uint n) +void skip_bits(inout GetBitContext gb, int n) { if (n > gb.bits_valid) RELOAD32() @@ -268,12 +268,12 @@ void skip_bits(inout GetBitContext gb, uint n) gb.bits_valid -= n; } -uint tell_bits(in GetBitContext gb) +int tell_bits(in GetBitContext gb) { - return uint(gb.buf - gb.buf_start) * 8 - gb.bits_valid; + return int(gb.buf - gb.buf_start) * 8 - gb.bits_valid; } -uint left_bits(in GetBitContext gb) +int left_bits(in GetBitContext gb) { - return gb.size_in_bits - uint(gb.buf - gb.buf_start) * 8 + gb.bits_valid; + return gb.size_in_bits - int(gb.buf - gb.buf_start) * 8 + gb.bits_valid; } diff --git a/libavcodec/vulkan/ffv1_dec_setup.comp b/libavcodec/vulkan/ffv1_dec_setup.comp index 671f28e7e7..5da09df21c 100644 --- a/libavcodec/vulkan/ffv1_dec_setup.comp +++ b/libavcodec/vulkan/ffv1_dec_setup.comp @@ -107,7 +107,7 @@ void golomb_init(inout SliceContext sc) uint64_t ac_byte_count = sc.c.bytestream - sc.c.bytestream_start - 1; init_get_bits(sc.gb, u8buf(sc.c.bytestream_start + ac_byte_count), - sc.c.bytestream_end - sc.c.bytestream_start - ac_byte_count); + int(sc.c.bytestream_end - sc.c.bytestream_start - ac_byte_count)); } void main(void) diff --git a/libavcodec/vulkan/ffv1_vlc.comp b/libavcodec/vulkan/ffv1_vlc.comp index d374e5a069..32a6ca9f37 100644 --- a/libavcodec/vulkan/ffv1_vlc.comp +++ b/libavcodec/vulkan/ffv1_vlc.comp @@ -121,7 +121,7 @@ Symbol get_vlc_symbol(inout VlcState state, int v, int bits) return set_sr_golomb(code, k, 12, bits); } -uint get_ur_golomb(inout GetBitContext gb, uint k, int limit, int esc_len) +uint get_ur_golomb(inout GetBitContext gb, int k, int limit, int esc_len) { for (uint i = 0; i < 12; i++) if (get_bit(gb)) @@ -130,7 +130,7 @@ uint get_ur_golomb(inout GetBitContext gb, uint k, int limit, int esc_len) return get_bits(gb, esc_len) + 11; } -int get_sr_golomb(inout GetBitContext gb, uint k, int limit, int esc_len) +int get_sr_golomb(inout GetBitContext gb, int k, int limit, int esc_len) { int v = int(get_ur_golomb(gb, k, limit, esc_len)); return (v >> 1) ^ -(v & 1); -- 2.50.0 _______________________________________________ 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".