This is an automated email from the git hooks/post-receive script. Git pushed a commit to branch master in repository ffmpeg.
commit 6c0b2be235f59309e3d18e14e7e435d744fb7200 Author: Lynne <[email protected]> AuthorDate: Tue Feb 3 18:55:29 2026 +0100 Commit: Lynne <[email protected]> CommitDate: Thu Feb 19 19:42:28 2026 +0100 vulkan_ffv1: remove golomb gb context from main slice context --- libavcodec/vulkan/ffv1_common.glsl | 4 +--- libavcodec/vulkan/ffv1_dec.comp.glsl | 12 +++++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/libavcodec/vulkan/ffv1_common.glsl b/libavcodec/vulkan/ffv1_common.glsl index 94b83ad09e..48261072a7 100644 --- a/libavcodec/vulkan/ffv1_common.glsl +++ b/libavcodec/vulkan/ffv1_common.glsl @@ -75,9 +75,7 @@ layout (push_constant, scalar) uniform pushConstants { struct SliceContext { RangeCoder c; -#ifdef DECODE - GetBitContext gb; -#else +#ifndef DECODE PutBitContext pb; /* 8*8 bytes */ #endif diff --git a/libavcodec/vulkan/ffv1_dec.comp.glsl b/libavcodec/vulkan/ffv1_dec.comp.glsl index 862f907972..c5dde13868 100644 --- a/libavcodec/vulkan/ffv1_dec.comp.glsl +++ b/libavcodec/vulkan/ffv1_dec.comp.glsl @@ -109,13 +109,15 @@ void decode_line(inout SliceContext sc, ivec2 sp, int w, } } #else +GetBitContext gb; + void golomb_init(inout SliceContext sc) { if (version == 3 && micro_version > 1 || version > 3) get_rac_internal(sc.c, sc.c.range * 129 >> 8); 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), + init_get_bits(gb, u8buf(sc.c.bytestream_start + ac_byte_count), int(sc.c.bytestream_end - sc.c.bytestream_start - ac_byte_count)); } @@ -148,13 +150,13 @@ void decode_line(inout SliceContext sc, ivec2 sp, int w, if (run_mode != 0) { if (run_count == 0 && run_mode == 1) { int tmp_idx = int(log2_run[run_index]); - if (get_bit(sc.gb)) { + if (get_bit(gb)) { run_count = 1 << tmp_idx; if (x + run_count <= w) run_index++; } else { if (tmp_idx != 0) { - run_count = int(get_bits(sc.gb, tmp_idx)); + run_count = int(get_bits(gb, tmp_idx)); } else run_count = 0; @@ -168,14 +170,14 @@ void decode_line(inout SliceContext sc, ivec2 sp, int w, if (run_count < 0) { run_mode = 0; run_count = 0; - diff = read_vlc_symbol(sc.gb, sb, bits); + diff = read_vlc_symbol(gb, sb, bits); if (diff >= 0) diff++; } else { diff = 0; } } else { - diff = read_vlc_symbol(sc.gb, sb, bits); + diff = read_vlc_symbol(gb, sb, bits); } if (pr[0] < 0) _______________________________________________ ffmpeg-cvslog mailing list -- [email protected] To unsubscribe send an email to [email protected]
