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 ECE524C948 for ; Thu, 10 Jul 2025 15:14:45 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 506F868DC97; Thu, 10 Jul 2025 18:14:07 +0300 (EEST) Received: from vidala.pars.ee (vidala.pars.ee [116.203.72.101]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id C40A56900B9 for ; Thu, 10 Jul 2025 18:13:58 +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=1752160438; bh=Baw1Ogfi6ADoXqT2Mqzi6pA F+hbvGCclGHGCMH7H8YE=; b=EajRVWoAWzRIkPXON00kjezFjWmBcbaT+2Yffs0c4r4kONU66R JpGGngpsjn6WquFo0lf4/p+uqKpYNClfldJR4CEYhIDzbW4s41aa/uHKkczYoBrfoBsRiYjj60N ddxA2LOpcGWskY6Ayi3Scy9ZwwKYfm0yeEw0hVk2gU0u8YM6iWqYttpOLmHHp0mFH8U1bx6oDFO fE9sE1uCXsY1U97HPyMY7/Iu6Mhpvj5xtAC2Wjcl5q6uS3P2OPnw+Dj9UX3gpg42So1jgfuRyK2 DOrNRXY69Z/VeEdHxGVk4NwuwtDkUiPKI8yWTeUc4WSmmcRlQDvUX5kiBnDoL0+rEhA==; DKIM-Signature: v=1; a=ed25519-sha256; s=202405e; d=lynne.ee; c=relaxed/relaxed; h=Message-ID:Date:Subject:To:From; t=1752160438; bh=Baw1Ogfi6ADoXqT2Mqzi6pA F+hbvGCclGHGCMH7H8YE=; b=SxpgNiwh+fZmZgEktyvfWbYZpACTsGHGdZ5xsSP4LheHgnCzgV NsjcNmUTFqN5EKcrbAvPXGuO+vLlHHTvrWAA==; From: Lynne To: ffmpeg-devel@ffmpeg.org Date: Fri, 11 Jul 2025 00:13:32 +0900 Message-ID: <20250710151349.1157547-4-dev@lynne.ee> X-Mailer: git-send-email 2.49.0.395.g12beb8f557c In-Reply-To: <20250710151349.1157547-1-dev@lynne.ee> References: <20250710151349.1157547-1-dev@lynne.ee> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 4/7] 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 +++++++++++----------- 1 file changed, 11 insertions(+), 11 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; } -- 2.49.0.395.g12beb8f557c _______________________________________________ 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".