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 ESMTPS id B9F6C4EEE1 for ; Wed, 14 May 2025 19:05:26 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C089A68C0DA; Wed, 14 May 2025 22:03:21 +0300 (EEST) Received: from vidala.pars.ee (vidala.pars.ee [116.203.72.101]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A709868BFED for ; Wed, 14 May 2025 22:02:57 +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=1747249377; bh=rPJ7ecw/EuUx+c3+kw14TnQ jykbvakTAR5W9wQT2zYw=; b=WCa9p8gGFI48IZ03ob7g7eW1cd1tGzgrKu9U1xyJ4u8DscYuJg dKCnknq11/YcL8t6N1t1bqDfUVO1zKeK61yB/m8vbA3HSEtEnbnCALD4yd6GFu9WcKiIe/Jzj+t 2cZEIMQ5+waB8Ww3Ho33h/4qRFrc9FzV7I4/aLIw3ESdAY36CSiOWyz4rE+bXdcMt1sxM2PM/ga RFhldrTJIyANLTRARDtUcM4znq8wdJ0KzPE82kfb1lfkav/UlDDgAY1qZJj6QSoX7882mALuD/U NogJN/V0lbI66haSSKQH5W4BSGvO+lI9XCIqgpkVnYXIpegJX16chMKz8SWj2ybxVBg==; DKIM-Signature: v=1; a=ed25519-sha256; s=202405e; d=lynne.ee; c=relaxed/relaxed; h=Message-ID:Date:Subject:To:From; t=1747249377; bh=rPJ7ecw/EuUx+c3+kw14TnQ jykbvakTAR5W9wQT2zYw=; b=EE3odNeXd+GzixOybpV25ep9ATidy1a+SYpELGWRHqmllzv2Sz 8hLLabco5I11aU/YLLziycbWrXt4K9x3toCQ==; From: Lynne To: ffmpeg-devel@ffmpeg.org Date: Wed, 14 May 2025 21:02:41 +0200 Message-ID: <20250514190253.162819-12-dev@lynne.ee> X-Mailer: git-send-email 2.49.0.395.g12beb8f557c In-Reply-To: <20250514190253.162819-1-dev@lynne.ee> References: <20250514190253.162819-1-dev@lynne.ee> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 12/16] vulkan/ffv1: unify encode and decode get/put primitives 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 simply makes a get_rac/put_rac_internal variant that can be reused. --- libavcodec/vulkan/rangecoder.comp | 57 +++++++++---------------------- 1 file changed, 17 insertions(+), 40 deletions(-) diff --git a/libavcodec/vulkan/rangecoder.comp b/libavcodec/vulkan/rangecoder.comp index 9e2c5fbecf..8687b8bc3c 100644 --- a/libavcodec/vulkan/rangecoder.comp +++ b/libavcodec/vulkan/rangecoder.comp @@ -95,26 +95,26 @@ void renorm_encoder(inout RangeCoder c) } #endif -void put_rac_direct(inout RangeCoder c, inout uint8_t state, bool bit) +void put_rac_internal(inout RangeCoder c, const int range1, bool bit) { - int range1 = uint16_t((c.range * state) >> 8); - #ifdef DEBUG - if (state == 0) - debugPrintfEXT("Error: state is zero"); if (range1 >= c.range) debugPrintfEXT("Error: range1 >= c.range"); if (range1 <= 0) debugPrintfEXT("Error: range1 <= 0"); #endif - int diff = c.range - range1; - c.low += bit ? diff : 0; - c.range = bit ? range1 : diff; + int ranged = c.range - range1; + c.low += bit ? ranged : 0; + c.range = bit ? range1 : ranged; if (expectEXT(c.range < 0x100, false)) renorm_encoder(c); +} +void put_rac_direct(inout RangeCoder c, inout uint8_t state, bool bit) +{ + put_rac_internal(c, (c.range * state) >> 8, bit); state = zero_one_state[(uint(bit) << 8) + state]; } @@ -126,21 +126,7 @@ void put_rac(inout RangeCoder c, uint64_t state, bool bit) /* Equiprobable bit */ void put_rac_equi(inout RangeCoder c, bool bit) { - int range1 = c.range >> 1; - -#ifdef DEBUG - if (range1 >= c.range) - debugPrintfEXT("Error: range1 >= c.range"); - if (range1 <= 0) - debugPrintfEXT("Error: range1 <= 0"); -#endif - - int diff = c.range - range1; - c.low += bit ? diff : 0; - c.range = bit ? range1 : diff; - - if (expectEXT(c.range < 0x100, false)) - renorm_encoder(c); + put_rac_internal(c, c.range >> 1, bit); } void put_rac_terminate(inout RangeCoder c) @@ -224,11 +210,9 @@ void refill(inout RangeCoder c) } } -bool get_rac_direct(inout RangeCoder c, inout uint8_t state) +bool get_rac_internal(inout RangeCoder c, const int range1) { - int range1 = c.range * state >> 8; int ranged = c.range - range1; - bool bit = c.low >= ranged; c.low -= bit ? ranged : 0; c.range = (bit ? 0 : ranged) + (bit ? range1 : 0); @@ -236,6 +220,12 @@ bool get_rac_direct(inout RangeCoder c, inout uint8_t state) if (expectEXT(c.range < 0x100, false)) refill(c); + return bit; +} + +bool get_rac_direct(inout RangeCoder c, inout uint8_t state) +{ + bool bit = get_rac_internal(c, c.range * state >> 8); state = zero_one_state[state + (bit ? 256 : 0)]; return bit; } @@ -247,18 +237,5 @@ bool get_rac(inout RangeCoder c, uint64_t state) bool get_rac_equi(inout RangeCoder c) { - int range1 = c.range >> 1; - - c.range -= range1; - - bool bit = c.low >= c.range; - if (bit) { - c.low -= c.range; - c.range = range1; - } - - if (expectEXT(c.range < 0x100, false)) - refill(c); - - return bit; + return get_rac_internal(c, c.range >> 1); } -- 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".