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 29B3F4EED5 for ; Wed, 14 May 2025 19:03:34 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0DC7B68C285; Wed, 14 May 2025 22:03:07 +0300 (EEST) Received: from vidala.pars.ee (vidala.pars.ee [116.203.72.101]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3181468BE7A for ; Wed, 14 May 2025 22:02:56 +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=1747249375; bh=EzM1qX00Cpi8WPbWP0CEP8Z ZDYmbOw73nUFcTO8ytok=; b=GbHnodwN5TK8BzstnUG/Q3GcD3Mc+ERqXW7RpWlEtlsxLpBMkp Xa/oxQDumJbVGCizDWL9N29uQWPSdjwdevo5uSTX1dw6mb+ZLVsQzEAO3Bh/eglAFyjd8Ne6s9/ zYKXgGdnDeSpGBMRrUecFu1R2HLVh0RDc688P95VPvBBys1uiTUlCrBZhOuQFmJwYgC4eXMi6qo wFepRjy7z2ns2XJYsmpvuLiBgFcqwTDEhiHOzHwSw8pDiR+P7UfRSz3SXr6ANDmNSf7EWIW1Pff EAYUA72UFQvBD7CtloARKRs5CiDVAd0X7PxVC8TEPJ8zxhCaxFQlIvdlpoJRqUgkUMg==; DKIM-Signature: v=1; a=ed25519-sha256; s=202405e; d=lynne.ee; c=relaxed/relaxed; h=Message-ID:Date:Subject:To:From; t=1747249375; bh=EzM1qX00Cpi8WPbWP0CEP8Z ZDYmbOw73nUFcTO8ytok=; b=iWAj7lQuaTj5vsk+yEj8JRALo55mGAZXmql6zy/SvZloQ2j7z4 tFVD+F79JMwr0yjo70wZO4qDAk3koFwBrtAQ==; From: Lynne To: ffmpeg-devel@ffmpeg.org Date: Wed, 14 May 2025 21:02:33 +0200 Message-ID: <20250514190253.162819-4-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 04/16] ffv1enc_vulkan: unify EC code between setup and encode 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: --- libavcodec/ffv1enc_vulkan.c | 1 + libavcodec/vulkan/ffv1_enc.comp | 7 ------- libavcodec/vulkan/ffv1_enc_setup.comp | 10 +++++----- libavcodec/vulkan/rangecoder.comp | 23 +++++++++++------------ 4 files changed, 17 insertions(+), 24 deletions(-) diff --git a/libavcodec/ffv1enc_vulkan.c b/libavcodec/ffv1enc_vulkan.c index d78ba3aca8..956463e932 100644 --- a/libavcodec/ffv1enc_vulkan.c +++ b/libavcodec/ffv1enc_vulkan.c @@ -976,6 +976,7 @@ static int init_setup_shader(AVCodecContext *avctx, FFVkSPIRVCompiler *spv) av_bprintf(&shd->src, "#define MAX_QUANT_TABLES %i\n", MAX_QUANT_TABLES); av_bprintf(&shd->src, "#define MAX_CONTEXT_INPUTS %i\n", MAX_CONTEXT_INPUTS); av_bprintf(&shd->src, "#define MAX_QUANT_TABLE_SIZE %i\n", MAX_QUANT_TABLE_SIZE); + av_bprintf(&shd->src, "#define FULL_RENORM\n"); desc_set = (FFVulkanDescriptorSetBinding []) { { diff --git a/libavcodec/vulkan/ffv1_enc.comp b/libavcodec/vulkan/ffv1_enc.comp index 7f8c831efa..a3c22f7459 100644 --- a/libavcodec/vulkan/ffv1_enc.comp +++ b/libavcodec/vulkan/ffv1_enc.comp @@ -63,13 +63,6 @@ ivec2 get_pred(readonly uimage2D pred, ivec2 sp, ivec2 off, int comp, int sw, ui } #ifndef GOLOMB -void put_rac(inout RangeCoder c, uint64_t state, bool bit) -{ - put_rac_norenorm(c, state, bit); - if (c.range < 0x100) - renorm_encoder(c); -} - /* Note - only handles signed values */ void put_symbol(inout RangeCoder c, uint64_t state, int v) { diff --git a/libavcodec/vulkan/ffv1_enc_setup.comp b/libavcodec/vulkan/ffv1_enc_setup.comp index d395770ba8..6f21e47523 100644 --- a/libavcodec/vulkan/ffv1_enc_setup.comp +++ b/libavcodec/vulkan/ffv1_enc_setup.comp @@ -50,18 +50,18 @@ void init_slice(out SliceContext sc, const uint slice_idx) void put_usymbol(inout RangeCoder c, uint v) { bool is_nil = (v == 0); - put_rac(c, state[0], is_nil); + put_rac_direct(c, state[0], is_nil); if (is_nil) return; const int e = findMSB(v); for (int i = 0; i < e; i++) - put_rac(c, state[1 + min(i, 9)], true); - put_rac(c, state[1 + min(e, 9)], false); + put_rac_direct(c, state[1 + min(i, 9)], true); + put_rac_direct(c, state[1 + min(e, 9)], false); for (int i = e - 1; i >= 0; i--) - put_rac(c, state[22 + min(i, 9)], bool(bitfieldExtract(v, i, 1))); + put_rac_direct(c, state[22 + min(i, 9)], bool(bitfieldExtract(v, i, 1))); } void write_slice_header(inout SliceContext sc) @@ -83,7 +83,7 @@ void write_slice_header(inout SliceContext sc) put_usymbol(sc.c, sar.y); if (version >= 4) { - put_rac(sc.c, state[0], sc.slice_reset_contexts); + put_rac_direct(sc.c, state[0], sc.slice_reset_contexts); put_usymbol(sc.c, sc.slice_coding_mode); if (sc.slice_coding_mode != 1 && colorspace == 1) { put_usymbol(sc.c, sc.slice_rct_coef.y); diff --git a/libavcodec/vulkan/rangecoder.comp b/libavcodec/vulkan/rangecoder.comp index 1db42e1dc9..badc65293f 100644 --- a/libavcodec/vulkan/rangecoder.comp +++ b/libavcodec/vulkan/rangecoder.comp @@ -31,8 +31,9 @@ struct RangeCoder { uint8_t outstanding_byte; }; +#ifdef FULL_RENORM /* Full renorm version that can handle outstanding_byte == 0xFF */ -void renorm_encoder_full(inout RangeCoder c) +void renorm_encoder(inout RangeCoder c) { int bs_cnt = 0; u8buf bytestream = u8buf(c.bytestream); @@ -62,6 +63,8 @@ void renorm_encoder_full(inout RangeCoder c) c.low = bitfieldInsert(0, c.low, 8, 8); } +#else + /* Cannot deal with outstanding_byte == -1 in the name of speed */ void renorm_encoder(inout RangeCoder c) { @@ -90,8 +93,9 @@ void renorm_encoder(inout RangeCoder c) for (int i = 1; i < oc; i++) bs[i].v = fill; } +#endif -void put_rac_direct(inout RangeCoder c, uint8_t state, bool bit) +void put_rac_direct(inout RangeCoder c, inout uint8_t state, bool bit) { int range1 = uint16_t((c.range * state) >> 8); @@ -111,21 +115,16 @@ void put_rac_direct(inout RangeCoder c, uint8_t state, bool bit) } else { c.range = diff; } -} -void put_rac_norenorm(inout RangeCoder c, uint64_t state, bool bit) -{ - put_rac_direct(c, u8buf(state).v, bit); + if (c.range < 0x100) + renorm_encoder(c); - u8buf(state).v = zero_one_state[(uint(bit) << 8) + u8buf(state).v]; + state = zero_one_state[(uint(bit) << 8) + state]; } -void put_rac(inout RangeCoder c, inout uint8_t state, bool bit) +void put_rac(inout RangeCoder c, uint64_t state, bool bit) { - put_rac_direct(c, state, bit); - if (c.range < 0x100) - renorm_encoder_full(c); - state = zero_one_state[(uint(bit) << 8) + state]; + put_rac_direct(c, u8buf(state).v, bit); } /* Equiprobable bit */ -- 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".