This is an automated email from the git hooks/post-receive script. Git pushed a commit to branch master in repository ffmpeg.
commit 9d5421ad92dc721ffb6de3094b456ff1aec30985 Author: Lynne <[email protected]> AuthorDate: Sat Feb 14 17:37:03 2026 +0100 Commit: Lynne <[email protected]> CommitDate: Thu Feb 19 19:42:35 2026 +0100 vulkan/ffv1: keep track of RCT Ry/By coeffs using vector suffixes This makes it far easier to read, particularly because when reading or writing, their order is swapped. --- libavcodec/vulkan/ffv1_dec.comp.glsl | 2 +- libavcodec/vulkan/ffv1_dec_setup.comp.glsl | 6 +++--- libavcodec/vulkan/ffv1_enc.comp.glsl | 2 +- libavcodec/vulkan/ffv1_enc_rct_search.comp.glsl | 2 +- libavcodec/vulkan/ffv1_enc_setup.comp.glsl | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/libavcodec/vulkan/ffv1_dec.comp.glsl b/libavcodec/vulkan/ffv1_dec.comp.glsl index fef3d4cbae..bfc5bd18c2 100644 --- a/libavcodec/vulkan/ffv1_dec.comp.glsl +++ b/libavcodec/vulkan/ffv1_dec.comp.glsl @@ -244,7 +244,7 @@ ivec4 transform_sample(ivec4 pix, ivec2 rct_coef) { pix.b -= rct_offset; pix.r -= rct_offset; - pix.g -= (pix.b*rct_coef.y + pix.r*rct_coef.x) >> 2; + pix.g -= (pix.b*rct_coef.g + pix.r*rct_coef.r) >> 2; pix.b += pix.g; pix.r += pix.g; return ivec4(pix[fmt_lut[0]], pix[fmt_lut[1]], diff --git a/libavcodec/vulkan/ffv1_dec_setup.comp.glsl b/libavcodec/vulkan/ffv1_dec_setup.comp.glsl index 011713a7dd..2f2a1dcd9d 100644 --- a/libavcodec/vulkan/ffv1_dec_setup.comp.glsl +++ b/libavcodec/vulkan/ffv1_dec_setup.comp.glsl @@ -98,9 +98,9 @@ bool decode_slice_header(inout SliceContext sc) sc.slice_reset_contexts = get_rac(rc_state[0]); sc.slice_coding_mode = get_usymbol(); if (sc.slice_coding_mode != 1 && colorspace == 1) { - sc.slice_rct_coef.x = int(get_usymbol()); - sc.slice_rct_coef.y = int(get_usymbol()); - if (sc.slice_rct_coef.x + sc.slice_rct_coef.y > 4) + sc.slice_rct_coef.g = int(get_usymbol()); + sc.slice_rct_coef.r = int(get_usymbol()); + if (sc.slice_rct_coef.g + sc.slice_rct_coef.r > 4) return true; } } diff --git a/libavcodec/vulkan/ffv1_enc.comp.glsl b/libavcodec/vulkan/ffv1_enc.comp.glsl index d18259274c..a56dca396f 100644 --- a/libavcodec/vulkan/ffv1_enc.comp.glsl +++ b/libavcodec/vulkan/ffv1_enc.comp.glsl @@ -227,7 +227,7 @@ void transform_sample(inout ivec4 pix, ivec2 rct_coef) { pix.b -= pix.g; pix.r -= pix.g; - pix.g += (pix.r*rct_coef.x + pix.b*rct_coef.y) >> 2; + pix.g += (pix.b*rct_coef.g + pix.r*rct_coef.r) >> 2; pix.b += rct_offset; pix.r += rct_offset; } diff --git a/libavcodec/vulkan/ffv1_enc_rct_search.comp.glsl b/libavcodec/vulkan/ffv1_enc_rct_search.comp.glsl index face9583a4..d72c667b10 100644 --- a/libavcodec/vulkan/ffv1_enc_rct_search.comp.glsl +++ b/libavcodec/vulkan/ffv1_enc_rct_search.comp.glsl @@ -71,7 +71,7 @@ ivec3 transform_sample(ivec3 pix, ivec2 rct_coef) { pix.b -= pix.g; pix.r -= pix.g; - pix.g += (pix.r*rct_coef.x + pix.b*rct_coef.y) >> 2; + pix.g += (pix.b*rct_coef.g + pix.r*rct_coef.r) >> 2; pix.b += rct_offset; pix.r += rct_offset; return pix; diff --git a/libavcodec/vulkan/ffv1_enc_setup.comp.glsl b/libavcodec/vulkan/ffv1_enc_setup.comp.glsl index 4350b34b5e..62e774ef86 100644 --- a/libavcodec/vulkan/ffv1_enc_setup.comp.glsl +++ b/libavcodec/vulkan/ffv1_enc_setup.comp.glsl @@ -96,8 +96,8 @@ void write_slice_header(inout SliceContext sc) put_rac(rc_state[0], force_pcm); put_usymbol(uint(force_pcm)); if (!force_pcm && colorspace == 1) { - put_usymbol(sc.slice_rct_coef.y); - put_usymbol(sc.slice_rct_coef.x); + put_usymbol(sc.slice_rct_coef.g); + put_usymbol(sc.slice_rct_coef.r); } } } _______________________________________________ ffmpeg-cvslog mailing list -- [email protected] To unsubscribe send an email to [email protected]
