diff --git a/release/c/wuffs-unsupported-snapshot.c b/release/c/wuffs-unsupported-snapshot.c index 1e993d3e..ec6e1886 100644 --- a/release/c/wuffs-unsupported-snapshot.c +++ b/release/c/wuffs-unsupported-snapshot.c @@ -83991,10 +83991,6 @@ wuffs_vp8__decoder__decode_macroblocks( } else { wuffs_vp8__decoder__filter_normal(self, a_workbuf, (v_mby - 1u)); } - v_status = wuffs_vp8__decoder__swizzle_one_row_of_macroblocks(self, a_dst, a_workbuf, (v_mby - 1u)); - if ( ! wuffs_base__status__is_ok(&v_status)) { - return wuffs_private_impl__status__ensure_not_a_suspension(v_status); - } } v_mby += 1u; } @@ -84288,6 +84284,7 @@ wuffs_vp8__decoder__swizzle_one_row_of_macroblocks( return wuffs_base__make_status(wuffs_base__error__bad_workbuf_length); } v_y_min_incl = wuffs_base__u32__sat_sub((a_mby * 16u), 6u); + v_y_min_incl = 0u; v_y_max_excl = ((a_mby * 16u) + 10u); if ((a_mby + 1u) >= self->private_impl.f_mbh) { v_y_max_excl = self->private_impl.f_height; diff --git a/std/vp8/decode_macroblocks.wuffs b/std/vp8/decode_macroblocks.wuffs index 1655d9ba..59982b07 100644 --- a/std/vp8/decode_macroblocks.wuffs +++ b/std/vp8/decode_macroblocks.wuffs @@ -48,10 +48,12 @@ pri func decoder.decode_macroblocks!(dst: ptr base.pixel_buffer, workbuf: slice this.filter_normal!(workbuf: args.workbuf, mby: mby - 1) } - status = this.swizzle_one_row_of_macroblocks!(dst: args.dst, workbuf: args.workbuf, mby: mby - 1) - if not status.is_ok() { - return status - } + // TODO(§): re-enable this when swizzle_ycck can take y_min_incl > 0. + // + // status = this.swizzle_one_row_of_macroblocks!(dst: args.dst, workbuf: args.workbuf, mby: mby - 1) + // if not status.is_ok() { + // return status + // } } mby += 1 @@ -375,6 +377,7 @@ pri func decoder.swizzle_one_row_of_macroblocks!( // happens after decoder.swizzle_one_row_of_macroblocks returns), unless // we're swizzling the bottom-most row of macroblocks. y_min_incl = (args.mby * 16) ~sat- 6 + y_min_incl = 0 // TODO(§): delete this. y_max_excl = (args.mby * 16) + 10 if (args.mby + 1) >= this.mbh { y_max_excl = this.height @@ -425,6 +428,7 @@ pri func decoder.swizzle_one_row_of_macroblocks!( v2: 1, v3: 0, ycc_model: base.YCC_MODEL__BT_601_STUDIO_RANGE as base.u8, + // TODO(§): let fancy upsampling work with y_min_incl > 0. ycc_upsampling: base.YCC_UPSAMPLING__BASIC as base.u8, scratch_buffer_2k: this.swizzle_ycck_scratch_buffer_2k[..]) return status