From 487922dab4e2342cb377e40e6ab413967fbdefa9 Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Wed, 17 Jun 2026 16:13:49 +1000 Subject: [PATCH] std/vp8: fix prediction modes and offsets This commit, part of a series, is inspired by pull request PR #168 by Damian Kaczmarek (with AI assistance), with some modifications. Updates PR #168 --- release/c/wuffs-unsupported-snapshot.c | 14 +++++++------- std/vp8/decode_reconstruct.wuffs | 16 ++++++++-------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/release/c/wuffs-unsupported-snapshot.c b/release/c/wuffs-unsupported-snapshot.c index 0cbf9d6f..ee0c46a2 100644 --- a/release/c/wuffs-unsupported-snapshot.c +++ b/release/c/wuffs-unsupported-snapshot.c @@ -84264,11 +84264,11 @@ wuffs_vp8__decoder__substitute_dc_top_left( uint32_t a_mbx, uint32_t a_mby) { if (a_mode == 0u) { - if (a_mby == 0u) { - if (a_mbx == 0u) { - return 11u; - } else { + if (a_mbx == 0u) { + if (a_mby == 0u) { return 12u; + } else { + return 11u; } } else if (a_mby == 0u) { return 10u; @@ -84326,7 +84326,7 @@ wuffs_vp8__decoder__prepare_yuv_cache( v_i += 1u; } } else { - v_offset = ((uint64_t)(((((a_mby - 1u) * self->private_impl.f_workbuf_yuv_y_stride) + a_mbx) * 16u))); + v_offset = ((uint64_t)(((((a_mby * 16u) - 1u) * self->private_impl.f_workbuf_yuv_y_stride) + (a_mbx * 16u)))); v_i = 0u; while (v_i < 16u) { v_o = (v_offset + ((uint64_t)(v_i))); @@ -84352,7 +84352,7 @@ wuffs_vp8__decoder__prepare_yuv_cache( v_i += 1u; } } - v_offset = (self->private_impl.f_workbuf_yuv_y_end + ((uint64_t)(((((a_mby - 1u) * self->private_impl.f_workbuf_yuv_uv_stride) + a_mbx) * 8u)))); + v_offset = (self->private_impl.f_workbuf_yuv_y_end + ((uint64_t)(((((a_mby * 8u) - 1u) * self->private_impl.f_workbuf_yuv_uv_stride) + (a_mbx * 8u))))); v_i = 0u; while (v_i < 8u) { v_o = (v_offset + ((uint64_t)(v_i))); @@ -84361,7 +84361,7 @@ wuffs_vp8__decoder__prepare_yuv_cache( } v_i += 1u; } - v_offset = (self->private_impl.f_workbuf_yuv_u_end + ((uint64_t)(((((a_mby - 1u) * self->private_impl.f_workbuf_yuv_uv_stride) + a_mbx) * 8u)))); + v_offset = (self->private_impl.f_workbuf_yuv_u_end + ((uint64_t)(((((a_mby * 8u) - 1u) * self->private_impl.f_workbuf_yuv_uv_stride) + (a_mbx * 8u))))); v_i = 0u; while (v_i < 8u) { v_o = (v_offset + ((uint64_t)(v_i))); diff --git a/std/vp8/decode_reconstruct.wuffs b/std/vp8/decode_reconstruct.wuffs index d433261e..e64a2d9d 100644 --- a/std/vp8/decode_reconstruct.wuffs +++ b/std/vp8/decode_reconstruct.wuffs @@ -98,11 +98,11 @@ pri func decoder.substitute_dc_top_left( mbx: base.u32[..= 0x3FF], mby: base.u32[..= 0x3FF]) base.u32[..= 12] { if args.mode == 0 { // DC. - if args.mby == 0 { - if args.mbx == 0 { - return 11 // DCLeft. - } else { + if args.mbx == 0 { + if args.mby == 0 { return 12 // DCTopLeft. + } else { + return 11 // DCLeft. } } else if args.mby == 0 { return 10 // DCTop. @@ -117,7 +117,7 @@ pri func decoder.prepare_yuv_cache!( mby: base.u32[..= 0x3FF]) { var i : base.u32 var j : base.u32 - var offset : base.u64[..= 0x17FE_1FF8] + var offset : base.u64[..= 0x17FE_FFF8] var o : base.u64 if args.mbx <= 0 { @@ -159,7 +159,7 @@ pri func decoder.prepare_yuv_cache!( } else { offset = 0 + - (((((args.mby - 1) * this.workbuf_yuv_y_stride) + args.mbx) * 16) as base.u64) + (((((args.mby * 16) - 1) * this.workbuf_yuv_y_stride) + (args.mbx * 16)) as base.u64) i = 0x00 while i < 0x10, inv args.mby > 0, @@ -194,7 +194,7 @@ pri func decoder.prepare_yuv_cache!( } offset = this.workbuf_yuv_y_end + - (((((args.mby - 1) * this.workbuf_yuv_uv_stride) + args.mbx) * 8) as base.u64) + (((((args.mby * 8) - 1) * this.workbuf_yuv_uv_stride) + (args.mbx * 8)) as base.u64) i = 0x00 while i < 0x08, inv args.mby > 0, @@ -207,7 +207,7 @@ pri func decoder.prepare_yuv_cache!( } offset = this.workbuf_yuv_u_end + - (((((args.mby - 1) * this.workbuf_yuv_uv_stride) + args.mbx) * 8) as base.u64) + (((((args.mby * 8) - 1) * this.workbuf_yuv_uv_stride) + (args.mbx * 8)) as base.u64) i = 0x00 while i < 0x08, inv args.mby > 0,