From 24fae427c1b91a8eeeea65b6cd3592e689085530 Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Fri, 19 Jun 2026 08:45:56 +1000 Subject: [PATCH] std/vp8: swizzle to the dst pixel buffer 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 | 187 ++++++++++++-------- std/vp8/decode_macroblocks.wuffs | 129 ++++++++++++-- std/vp8/decode_vp8.wuffs | 70 +------- test/3pdata/nia-checksums-of-blinksuite.txt | 8 +- test/3pdata/nia-checksums-of-webpsuite.txt | 154 ++++++++-------- test/c/std/webp.c | 6 +- test/nia-checksums-of-data.txt | 24 +-- 7 files changed, 323 insertions(+), 255 deletions(-) diff --git a/release/c/wuffs-unsupported-snapshot.c b/release/c/wuffs-unsupported-snapshot.c index c67bf04c..b1f9d705 100644 --- a/release/c/wuffs-unsupported-snapshot.c +++ b/release/c/wuffs-unsupported-snapshot.c @@ -15536,8 +15536,6 @@ struct wuffs_vp8__decoder__struct { uint32_t f_mb_dc_nz; uint32_t f_mb_ac_nz; uint8_t f_yuv_cache[26][32]; - uint32_t f_dst_x; - uint32_t f_dst_y; wuffs_base__pixel_swizzler f_swizzler; uint32_t p_copy_partitions_to_workbuf; @@ -15550,6 +15548,7 @@ struct wuffs_vp8__decoder__struct { } private_impl; struct { + uint8_t f_swizzle_ycck_scratch_buffer_2k[2048]; uint8_t f_coeff_probs[1056]; uint16_t f_mb_coeffs[25][16]; uint32_t f_mb_states_left; @@ -81993,6 +81992,7 @@ WUFFS_BASE__GENERATED_C_CODE static wuffs_base__status wuffs_vp8__decoder__decode_macroblocks( wuffs_vp8__decoder* self, + wuffs_base__pixel_buffer* a_dst, wuffs_base__slice_u8 a_workbuf); WUFFS_BASE__GENERATED_C_CODE @@ -82039,6 +82039,14 @@ wuffs_vp8__decoder__copy_from_yuv_cache( uint32_t a_mbx, uint32_t a_mby); +WUFFS_BASE__GENERATED_C_CODE +static wuffs_base__status +wuffs_vp8__decoder__swizzle_one_row_of_macroblocks( + wuffs_vp8__decoder* self, + wuffs_base__pixel_buffer* a_dst, + wuffs_base__slice_u8 a_workbuf, + uint32_t a_mby); + WUFFS_BASE__GENERATED_C_CODE static wuffs_base__empty_struct wuffs_vp8__decoder__predict_y4( @@ -82108,12 +82116,6 @@ wuffs_vp8__decoder__do_decode_frame( wuffs_base__slice_u8 a_workbuf, wuffs_base__decode_frame_options* a_opts); -WUFFS_BASE__GENERATED_C_CODE -static wuffs_base__status -wuffs_vp8__decoder__make_a_placeholder_gradient( - wuffs_vp8__decoder* self, - wuffs_base__pixel_buffer* a_dst); - // ---------------- VTables const wuffs_base__image_decoder__func_ptrs @@ -83887,9 +83889,11 @@ WUFFS_BASE__GENERATED_C_CODE static wuffs_base__status wuffs_vp8__decoder__decode_macroblocks( wuffs_vp8__decoder* self, + wuffs_base__pixel_buffer* a_dst, wuffs_base__slice_u8 a_workbuf) { uint32_t v_mby = 0; uint32_t v_mbx = 0; + wuffs_base__status v_status = wuffs_base__make_status(NULL); v_mbx = 0u; while (v_mbx < self->private_impl.f_mbw) { @@ -83904,19 +83908,32 @@ wuffs_vp8__decoder__decode_macroblocks( wuffs_vp8__decoder__decode_one_macroblock(self, a_workbuf, v_mbx, v_mby); v_mbx += 1u; } - if ((v_mby <= 0u) || (self->private_impl.f_filt_level <= 0u)) { - } else if (self->private_impl.f_filt_simple) { - wuffs_vp8__decoder__filter_simple(self, a_workbuf, (v_mby - 1u)); - } else { - wuffs_vp8__decoder__filter_normal(self, a_workbuf, (v_mby - 1u)); + if (v_mby > 0u) { + if (self->private_impl.f_filt_level <= 0u) { + } else if (self->private_impl.f_filt_simple) { + wuffs_vp8__decoder__filter_simple(self, a_workbuf, (v_mby - 1u)); + } 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; } - if ((self->private_impl.f_mbh <= 0u) || (self->private_impl.f_filt_level <= 0u)) { - } else if (self->private_impl.f_filt_simple) { - wuffs_vp8__decoder__filter_simple(self, a_workbuf, (self->private_impl.f_mbh - 1u)); - } else { - wuffs_vp8__decoder__filter_normal(self, a_workbuf, (self->private_impl.f_mbh - 1u)); + if (self->private_impl.f_mbh > 0u) { + v_mby = (self->private_impl.f_mbh - 1u); + if (self->private_impl.f_filt_level <= 0u) { + } else if (self->private_impl.f_filt_simple) { + wuffs_vp8__decoder__filter_simple(self, a_workbuf, v_mby); + } else { + wuffs_vp8__decoder__filter_normal(self, a_workbuf, v_mby); + } + v_status = wuffs_vp8__decoder__swizzle_one_row_of_macroblocks(self, a_dst, a_workbuf, v_mby); + if ( ! wuffs_base__status__is_ok(&v_status)) { + return wuffs_private_impl__status__ensure_not_a_suspension(v_status); + } } return wuffs_base__make_status(NULL); } @@ -84169,6 +84186,80 @@ wuffs_vp8__decoder__copy_from_yuv_cache( return wuffs_base__make_empty_struct(); } +// -------- func vp8.decoder.swizzle_one_row_of_macroblocks + +WUFFS_BASE__GENERATED_C_CODE +static wuffs_base__status +wuffs_vp8__decoder__swizzle_one_row_of_macroblocks( + wuffs_vp8__decoder* self, + wuffs_base__pixel_buffer* a_dst, + wuffs_base__slice_u8 a_workbuf, + uint32_t a_mby) { + uint32_t v_y_min_incl = 0; + uint32_t v_y_max_excl = 0; + uint64_t v_o = 0; + wuffs_base__slice_u8 v_src0 = {0}; + wuffs_base__slice_u8 v_src1 = {0}; + wuffs_base__slice_u8 v_src2 = {0}; + wuffs_base__status v_status = wuffs_base__make_status(NULL); + + if ((self->private_impl.f_workbuf_yuv_y_end > self->private_impl.f_workbuf_yuv_u_end) || (self->private_impl.f_workbuf_yuv_u_end > self->private_impl.f_workbuf_yuv_v_end) || (self->private_impl.f_workbuf_yuv_v_end > ((uint64_t)(a_workbuf.len)))) { + 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_max_excl = ((a_mby * 16u) + 10u); + if ((a_mby + 1u) >= self->private_impl.f_mbh) { + v_y_max_excl = self->private_impl.f_height; + } + v_o = ((uint64_t)((v_y_min_incl * self->private_impl.f_workbuf_yuv_y_stride))); + if (v_o < self->private_impl.f_workbuf_yuv_y_end) { + v_src0 = wuffs_base__slice_u8__subslice_ij(a_workbuf, v_o, self->private_impl.f_workbuf_yuv_y_end); + } + v_o = (((uint64_t)(((v_y_min_incl / 2u) * self->private_impl.f_workbuf_yuv_uv_stride))) + self->private_impl.f_workbuf_yuv_y_end); + if (v_o < self->private_impl.f_workbuf_yuv_u_end) { + v_src1 = wuffs_base__slice_u8__subslice_ij(a_workbuf, v_o, self->private_impl.f_workbuf_yuv_u_end); + } + v_o = (((uint64_t)(((v_y_min_incl / 2u) * self->private_impl.f_workbuf_yuv_uv_stride))) + self->private_impl.f_workbuf_yuv_u_end); + if (v_o < self->private_impl.f_workbuf_yuv_v_end) { + v_src2 = wuffs_base__slice_u8__subslice_ij(a_workbuf, v_o, self->private_impl.f_workbuf_yuv_v_end); + } + v_status = wuffs_base__pixel_swizzler__swizzle_ycck(&self->private_impl.f_swizzler, + a_dst, + wuffs_base__pixel_buffer__palette(a_dst), + 0u, + self->private_impl.f_width, + v_y_min_incl, + v_y_max_excl, + v_src0, + v_src1, + v_src2, + wuffs_base__utility__empty_slice_u8(), + (self->private_impl.f_mbw * 16u), + (self->private_impl.f_mbw * 8u), + (self->private_impl.f_mbw * 8u), + 0u, + wuffs_base__u32__sat_sub((self->private_impl.f_mbh * 16u), v_y_min_incl), + wuffs_base__u32__sat_sub((self->private_impl.f_mbh * 8u), (v_y_min_incl / 2u)), + wuffs_base__u32__sat_sub((self->private_impl.f_mbh * 8u), (v_y_min_incl / 2u)), + 0u, + (self->private_impl.f_mbw * 16u), + (self->private_impl.f_mbw * 8u), + (self->private_impl.f_mbw * 8u), + 0u, + 2u, + 1u, + 1u, + 0u, + 2u, + 1u, + 1u, + 0u, + false, + false, + wuffs_base__make_slice_u8(self->private_data.f_swizzle_ycck_scratch_buffer_2k, 2048)); + return wuffs_private_impl__status__ensure_not_a_suspension(v_status); +} + // -------- func vp8.decoder.predict_y4 WUFFS_BASE__GENERATED_C_CODE @@ -85663,19 +85754,6 @@ wuffs_vp8__decoder__do_decode_frame( } goto ok; } - v_status = wuffs_vp8__decoder__decode_macroblocks(self, a_workbuf); - if ( ! wuffs_base__status__is_ok(&v_status)) { - status = v_status; - if (wuffs_base__status__is_error(&status)) { - goto exit; - } else if (wuffs_base__status__is_suspension(&status)) { - status = wuffs_base__make_status(wuffs_base__error__cannot_return_a_suspension); - goto exit; - } - goto ok; - } - self->private_impl.f_dst_x = 0u; - self->private_impl.f_dst_y = 0u; v_status = wuffs_base__pixel_swizzler__prepare(&self->private_impl.f_swizzler, wuffs_base__pixel_buffer__pixel_format(a_dst), wuffs_base__pixel_buffer__palette(a_dst), @@ -85692,7 +85770,7 @@ wuffs_vp8__decoder__do_decode_frame( } goto ok; } - v_status = wuffs_vp8__decoder__make_a_placeholder_gradient(self, a_dst); + v_status = wuffs_vp8__decoder__decode_macroblocks(self, a_dst, a_workbuf); if ( ! wuffs_base__status__is_ok(&v_status)) { status = v_status; if (wuffs_base__status__is_error(&status)) { @@ -85719,51 +85797,6 @@ wuffs_vp8__decoder__do_decode_frame( return status; } -// -------- func vp8.decoder.make_a_placeholder_gradient - -WUFFS_BASE__GENERATED_C_CODE -static wuffs_base__status -wuffs_vp8__decoder__make_a_placeholder_gradient( - wuffs_vp8__decoder* self, - wuffs_base__pixel_buffer* a_dst) { - wuffs_base__pixel_format v_dst_pixfmt = {0}; - uint32_t v_dst_bits_per_pixel = 0; - uint32_t v_dst_bytes_per_pixel = 0; - uint64_t v_dst_bytes_per_row = 0; - wuffs_base__table_u8 v_tab = {0}; - wuffs_base__slice_u8 v_dst = {0}; - uint64_t v_i = 0; - uint8_t v_bgrx[4] = {0}; - - v_dst_pixfmt = wuffs_base__pixel_buffer__pixel_format(a_dst); - v_dst_bits_per_pixel = wuffs_base__pixel_format__bits_per_pixel(&v_dst_pixfmt); - if ((v_dst_bits_per_pixel & 7u) != 0u) { - return wuffs_base__make_status(wuffs_base__error__unsupported_option); - } - v_dst_bytes_per_pixel = (v_dst_bits_per_pixel / 8u); - v_dst_bytes_per_row = ((uint64_t)((self->private_impl.f_width * v_dst_bytes_per_pixel))); - v_tab = wuffs_base__pixel_buffer__plane(a_dst, 0u); - v_bgrx[0u] = 128u; - while (self->private_impl.f_dst_y < self->private_impl.f_height) { - v_bgrx[1u] = ((uint8_t)(self->private_impl.f_dst_y)); - self->private_impl.f_dst_x = 0u; - while (self->private_impl.f_dst_x < self->private_impl.f_width) { - v_bgrx[2u] = ((uint8_t)(self->private_impl.f_dst_x)); - v_dst = wuffs_private_impl__table_u8__row_u32(v_tab, self->private_impl.f_dst_y); - if (v_dst_bytes_per_row < ((uint64_t)(v_dst.len))) { - v_dst = wuffs_base__slice_u8__subslice_j(v_dst, v_dst_bytes_per_row); - } - v_i = (((uint64_t)(self->private_impl.f_dst_x)) * ((uint64_t)(v_dst_bytes_per_pixel))); - if (v_i < ((uint64_t)(v_dst.len))) { - wuffs_base__pixel_swizzler__swizzle_interleaved_from_slice(&self->private_impl.f_swizzler, wuffs_base__slice_u8__subslice_i(v_dst, v_i), wuffs_base__pixel_buffer__palette(a_dst), wuffs_base__make_slice_u8(v_bgrx, 4)); - } - self->private_impl.f_dst_x += 1u; - } - self->private_impl.f_dst_y += 1u; - } - return wuffs_base__make_status(NULL); -} - // -------- func vp8.decoder.frame_dirty_rect WUFFS_BASE__GENERATED_C_CODE diff --git a/std/vp8/decode_macroblocks.wuffs b/std/vp8/decode_macroblocks.wuffs index 230f3515..fc8c9368 100644 --- a/std/vp8/decode_macroblocks.wuffs +++ b/std/vp8/decode_macroblocks.wuffs @@ -8,9 +8,10 @@ // // SPDX-License-Identifier: Apache-2.0 OR MIT -pri func decoder.decode_macroblocks!(workbuf: slice base.u8) base.status { - var mby : base.u32 - var mbx : base.u32 +pri func decoder.decode_macroblocks!(dst: ptr base.pixel_buffer, workbuf: slice base.u8) base.status { + var mby : base.u32 + var mbx : base.u32 + var status : base.status mbx = 0 while mbx < this.mbw { @@ -38,23 +39,38 @@ pri func decoder.decode_macroblocks!(workbuf: slice base.u8) base.status { mbx += 1 } - if (mby <= 0) or (this.filt_level <= 0) { - // No-op. - } else if this.filt_simple { - this.filter_simple!(workbuf: args.workbuf, mby: mby - 1) - } else { - this.filter_normal!(workbuf: args.workbuf, mby: mby - 1) + if mby > 0 { + if this.filt_level <= 0 { + // No-op. + } else if this.filt_simple { + this.filter_simple!(workbuf: args.workbuf, mby: mby - 1) + } else { + 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 + } } mby += 1 } - if (this.mbh <= 0) or (this.filt_level <= 0) { - // No-op. - } else if this.filt_simple { - this.filter_simple!(workbuf: args.workbuf, mby: this.mbh - 1) - } else { - this.filter_normal!(workbuf: args.workbuf, mby: this.mbh - 1) + if this.mbh > 0 { + mby = this.mbh - 1 + if this.filt_level <= 0 { + // No-op. + } else if this.filt_simple { + this.filter_simple!(workbuf: args.workbuf, mby: mby) + } else { + this.filter_normal!(workbuf: args.workbuf, mby: mby) + } + + status = this.swizzle_one_row_of_macroblocks!(dst: args.dst, workbuf: args.workbuf, mby: mby) + if not status.is_ok() { + return status + } } return ok @@ -323,3 +339,86 @@ pri func decoder.copy_from_yuv_cache!( i += 1 } } + +pri func decoder.swizzle_one_row_of_macroblocks!( + dst: ptr base.pixel_buffer, + workbuf: slice base.u8, + mby: base.u32[..= 0x3FF]) base.status { + var y_min_incl : base.u32[..= 0x3FFF] + var y_max_excl : base.u32[..= 0x3FFF] + + var o : base.u64 + var src0 : slice base.u8 + var src1 : slice base.u8 + var src2 : slice base.u8 + + var status : base.status + + if (this.workbuf_yuv_y_end > this.workbuf_yuv_u_end) or + (this.workbuf_yuv_u_end > this.workbuf_yuv_v_end) or + (this.workbuf_yuv_v_end > args.workbuf.length()) { + return base."#bad workbuf length" + } + assert this.workbuf_yuv_u_end <= args.workbuf.length() via "a <= b: a <= c; c <= b"(c: this.workbuf_yuv_v_end) + assert this.workbuf_yuv_y_end <= args.workbuf.length() via "a <= b: a <= c; c <= b"(c: this.workbuf_yuv_u_end) + + // There are 16 rows of pixels per macroblock. However, the bottom 6 rows + // of pixels (the bottom 3 rows of samples, at 4:2:0 chroma subsampling) + // can be modified by the the macroblock below's loop filtering (which + // 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_max_excl = (args.mby * 16) + 10 + if (args.mby + 1) >= this.mbh { + y_max_excl = this.height + } + + o = (y_min_incl * this.workbuf_yuv_y_stride) as base.u64 + if o < this.workbuf_yuv_y_end { + src0 = args.workbuf[o .. this.workbuf_yuv_y_end] + } + o = (((y_min_incl / 2) * this.workbuf_yuv_uv_stride) as base.u64) + this.workbuf_yuv_y_end + if o < this.workbuf_yuv_u_end { + src1 = args.workbuf[o .. this.workbuf_yuv_u_end] + } + o = (((y_min_incl / 2) * this.workbuf_yuv_uv_stride) as base.u64) + this.workbuf_yuv_u_end + if o < this.workbuf_yuv_v_end { + src2 = args.workbuf[o .. this.workbuf_yuv_v_end] + } + + status = this.swizzler.swizzle_ycck!( + dst: args.dst, + dst_palette: args.dst.palette(), + x_min_incl: 0, + x_max_excl: this.width, + y_min_incl: y_min_incl, + y_max_excl: y_max_excl, + src0: src0, + src1: src1, + src2: src2, + src3: this.util.empty_slice_u8(), + width0: this.mbw * 16, + width1: this.mbw * 8, + width2: this.mbw * 8, + width3: 0, + height0: (this.mbh * 16) ~sat- y_min_incl, + height1: (this.mbh * 8) ~sat- (y_min_incl / 2), + height2: (this.mbh * 8) ~sat- (y_min_incl / 2), + height3: 0, + stride0: this.mbw * 16, + stride1: this.mbw * 8, + stride2: this.mbw * 8, + stride3: 0, + h0: 2, + h1: 1, + h2: 1, + h3: 0, + v0: 2, + v1: 1, + v2: 1, + v3: 0, + is_rgb_or_cmyk: false, + triangle_filter_for_2to1: false, + scratch_buffer_2k: this.swizzle_ycck_scratch_buffer_2k[..]) + return status +} diff --git a/std/vp8/decode_vp8.wuffs b/std/vp8/decode_vp8.wuffs index ac85c5d1..593a901d 100644 --- a/std/vp8/decode_vp8.wuffs +++ b/std/vp8/decode_vp8.wuffs @@ -134,12 +134,11 @@ pub struct decoder? implements base.image_decoder( yuv_cache : array[26] array[32] base.u8, - dst_x : base.u32, - dst_y : base.u32, - swizzler : base.pixel_swizzler, util : base.utility, ) + ( + swizzle_ycck_scratch_buffer_2k : array[2048] base.u8, + // 1056 is (4 planes, 8 bands, 3 contexts, 11 tokens) flattened. coeff_probs : array[1056] base.u8, @@ -371,14 +370,6 @@ pri func decoder.do_decode_frame?(dst: ptr base.pixel_buffer, src: base.io_reade return status } - status = this.decode_macroblocks!(workbuf: args.workbuf) - if not status.is_ok() { - return status - } - - this.dst_x = 0 - this.dst_y = 0 - status = this.swizzler.prepare!( dst_pixfmt: args.dst.pixel_format(), dst_palette: args.dst.palette(), @@ -389,8 +380,7 @@ pri func decoder.do_decode_frame?(dst: ptr base.pixel_buffer, src: base.io_reade return status } - // TODO: actually decode the pixels. - status = this.make_a_placeholder_gradient!(dst: args.dst) + status = this.decode_macroblocks!(dst: args.dst, workbuf: args.workbuf) if not status.is_ok() { return status } @@ -398,60 +388,6 @@ pri func decoder.do_decode_frame?(dst: ptr base.pixel_buffer, src: base.io_reade this.call_sequence = 0x60 } -pri func decoder.make_a_placeholder_gradient!(dst: ptr base.pixel_buffer) base.status { - var dst_pixfmt : base.pixel_format - var dst_bits_per_pixel : base.u32[..= 256] - var dst_bytes_per_pixel : base.u32[..= 32] - var dst_bytes_per_row : base.u64 - var tab : table base.u8 - var dst : slice base.u8 - var i : base.u64 - var bgrx : array[4] base.u8 - - // TODO: the dst_pixfmt variable shouldn't be necessary. We should be able - // to chain the two calls: "args.dst.pixel_format().bits_per_pixel()". - dst_pixfmt = args.dst.pixel_format() - dst_bits_per_pixel = dst_pixfmt.bits_per_pixel() - if (dst_bits_per_pixel & 7) <> 0 { - return base."#unsupported option" - } - dst_bytes_per_pixel = dst_bits_per_pixel / 8 - dst_bytes_per_row = (this.width * dst_bytes_per_pixel) as base.u64 - tab = args.dst.plane(p: 0) - - bgrx[0] = 0x80 - - while this.dst_y < this.height { - assert this.dst_y < 0x3FFF via "a < b: a < c; c <= b"(c: this.height) - bgrx[1] = (this.dst_y & 0xFF) as base.u8 - - this.dst_x = 0 - while this.dst_x < this.width, - inv this.dst_y < 0x3FFF, - { - assert this.dst_x < 0x3FFF via "a < b: a < c; c <= b"(c: this.width) - bgrx[2] = (this.dst_x & 0xFF) as base.u8 - - dst = tab.row_u32(y: this.dst_y) - if dst_bytes_per_row < dst.length() { - dst = dst[.. dst_bytes_per_row] - } - i = (this.dst_x as base.u64) * (dst_bytes_per_pixel as base.u64) - if i < dst.length() { - this.swizzler.swizzle_interleaved_from_slice!( - dst: dst[i ..], - dst_palette: args.dst.palette(), - src: bgrx[.. 4]) - } - - this.dst_x += 1 - } - this.dst_y += 1 - } - - return ok -} - pub func decoder.frame_dirty_rect() base.rect_ie_u32 { return this.util.make_rect_ie_u32( min_incl_x: 0, diff --git a/test/3pdata/nia-checksums-of-blinksuite.txt b/test/3pdata/nia-checksums-of-blinksuite.txt index 6b0a2894..21b93cbc 100644 --- a/test/3pdata/nia-checksums-of-blinksuite.txt +++ b/test/3pdata/nia-checksums-of-blinksuite.txt @@ -91,7 +91,7 @@ OK. f37cea44 test/3pdata/blinksuite/icc-v2-gbr-422-whole-mcus.jpg OK. 1de5a906 test/3pdata/blinksuite/icc-v2-gbr.jpg OK. 0da5f37e test/3pdata/blinksuite/jpeg-height-exif-orientation.jpg OK. 4409dca6 test/3pdata/blinksuite/large-gif-checkerboard.gif -OK. 42c50963 test/3pdata/blinksuite/large.webp +OK. 4a86fc02 test/3pdata/blinksuite/large.webp BAD 2f310e57 test/3pdata/blinksuite/missing-eoi.jpg OK. 72bbe2b6 test/3pdata/blinksuite/motion-jpeg-single-frame.jpg OK. 0268284a test/3pdata/blinksuite/mu.png @@ -170,10 +170,10 @@ OK. 9a7e5ec7 test/3pdata/blinksuite/sprite_alternate_fragments_same.png OK. 1b1f5f96 test/3pdata/blinksuite/stripes-large.png OK. 6b85cdb9 test/3pdata/blinksuite/stripes-small.png OK. 16c2c0fe test/3pdata/blinksuite/test-load.jpg -OK. 2e88e913 test/3pdata/blinksuite/test.webp +OK. 2f7e9a6e test/3pdata/blinksuite/test.webp OK. 19d3a207 test/3pdata/blinksuite/test3.webp -OK. 60f368dc test/3pdata/blinksuite/truncated2.webp -OK. 194d8b64 test/3pdata/blinksuite/webp-color-no-profile-lossy.webp +BAD 1dfa35c6 test/3pdata/blinksuite/truncated2.webp +OK. 1ecb21c0 test/3pdata/blinksuite/webp-color-no-profile-lossy.webp BAD ed67a9a5 test/3pdata/blinksuite/wrong-block-length.gif OK. 577c5c4c test/3pdata/blinksuite/ycbcr-420-fast-int-progressive.jpg OK. bf4cd8e2 test/3pdata/blinksuite/ycbcr-420-float-progressive.jpg diff --git a/test/3pdata/nia-checksums-of-webpsuite.txt b/test/3pdata/nia-checksums-of-webpsuite.txt index a7a1b2ae..be077d8c 100644 --- a/test/3pdata/nia-checksums-of-webpsuite.txt +++ b/test/3pdata/nia-checksums-of-webpsuite.txt @@ -1,10 +1,10 @@ # Generated by script/print-nia-checksums.sh OK. ca4c0038 test/3pdata/webpsuite/bad_palette_index.webp -OK. 807f5a23 test/3pdata/webpsuite/bryce.webp -OK. 2ee5c270 test/3pdata/webpsuite/bug3.webp +OK. 90104612 test/3pdata/webpsuite/bryce.webp +OK. e3e6c4f2 test/3pdata/webpsuite/bug3.webp OK. 6fbda804 test/3pdata/webpsuite/color_cache_bits_11.webp BAD d338aed8 test/3pdata/webpsuite/dual_transform.webp -OK. 1ef61f19 test/3pdata/webpsuite/grid.bmp +OK. f79224e7 test/3pdata/webpsuite/grid.bmp OK. 33b7a1f3 test/3pdata/webpsuite/grid.pgm OK. f79224e7 test/3pdata/webpsuite/grid.png OK. 06b07a30 test/3pdata/webpsuite/grid.ppm @@ -36,90 +36,90 @@ BAD df11692d test/3pdata/webpsuite/lossless_vec_1_9.webp OK. 6706e719 test/3pdata/webpsuite/lossless_vec_2_0.webp OK. 6706e719 test/3pdata/webpsuite/lossless_vec_2_1.webp OK. 6706e719 test/3pdata/webpsuite/lossless_vec_2_10.webp -BAD 62adeb37 test/3pdata/webpsuite/lossless_vec_2_11.webp +BAD 79781cfb test/3pdata/webpsuite/lossless_vec_2_11.webp OK. 6706e719 test/3pdata/webpsuite/lossless_vec_2_12.webp -BAD 62adeb37 test/3pdata/webpsuite/lossless_vec_2_13.webp +BAD 79781cfb test/3pdata/webpsuite/lossless_vec_2_13.webp OK. 6706e719 test/3pdata/webpsuite/lossless_vec_2_14.webp -BAD 62adeb37 test/3pdata/webpsuite/lossless_vec_2_15.webp +BAD 79781cfb test/3pdata/webpsuite/lossless_vec_2_15.webp OK. 6706e719 test/3pdata/webpsuite/lossless_vec_2_2.webp -BAD 62adeb37 test/3pdata/webpsuite/lossless_vec_2_3.webp +BAD 79781cfb test/3pdata/webpsuite/lossless_vec_2_3.webp OK. 6706e719 test/3pdata/webpsuite/lossless_vec_2_4.webp OK. 6706e719 test/3pdata/webpsuite/lossless_vec_2_5.webp OK. 6706e719 test/3pdata/webpsuite/lossless_vec_2_6.webp -BAD 62adeb37 test/3pdata/webpsuite/lossless_vec_2_7.webp +BAD 79781cfb test/3pdata/webpsuite/lossless_vec_2_7.webp OK. 6706e719 test/3pdata/webpsuite/lossless_vec_2_8.webp -BAD 62adeb37 test/3pdata/webpsuite/lossless_vec_2_9.webp -OK. d1ed71a2 test/3pdata/webpsuite/lossy_extreme_probabilities.webp -OK. 2e88e913 test/3pdata/webpsuite/lossy_q0_f100.webp +BAD 79781cfb test/3pdata/webpsuite/lossless_vec_2_9.webp +OK. fb75ebb9 test/3pdata/webpsuite/lossy_extreme_probabilities.webp +OK. bdf17bed test/3pdata/webpsuite/lossy_q0_f100.webp OK. 6957defa test/3pdata/webpsuite/near_lossless_75.webp OK. 7c80a001 test/3pdata/webpsuite/one_color_no_palette.webp OK. 6706e719 test/3pdata/webpsuite/peak.bmp OK. 315bbd77 test/3pdata/webpsuite/peak.pgm OK. 6706e719 test/3pdata/webpsuite/peak.png OK. 6706e719 test/3pdata/webpsuite/peak.ppm -OK. 69f5f4ec test/3pdata/webpsuite/segment01.webp -OK. 69f5f4ec test/3pdata/webpsuite/segment02.webp -OK. 69f5f4ec test/3pdata/webpsuite/segment03.webp -OK. 61e94e53 test/3pdata/webpsuite/small_13x1.webp -OK. 2d7e6391 test/3pdata/webpsuite/small_1x1.webp -OK. 7c595111 test/3pdata/webpsuite/small_1x13.webp -OK. 9240e9d0 test/3pdata/webpsuite/small_31x13.webp -OK. 2e88e913 test/3pdata/webpsuite/test-nostrong.webp -OK. 2e88e913 test/3pdata/webpsuite/test.webp -OK. 8b56f1b6 test/3pdata/webpsuite/very_short.webp -OK. c42a950e test/3pdata/webpsuite/vp80-00-comprehensive-001.webp -OK. c42a950e test/3pdata/webpsuite/vp80-00-comprehensive-002.webp -OK. c42a950e test/3pdata/webpsuite/vp80-00-comprehensive-003.webp -OK. c42a950e test/3pdata/webpsuite/vp80-00-comprehensive-004.webp -OK. c42a950e test/3pdata/webpsuite/vp80-00-comprehensive-005.webp -OK. e3e955c2 test/3pdata/webpsuite/vp80-00-comprehensive-006.webp -OK. c42a950e test/3pdata/webpsuite/vp80-00-comprehensive-007.webp -OK. 69cf2fa7 test/3pdata/webpsuite/vp80-00-comprehensive-008.webp -OK. c42a950e test/3pdata/webpsuite/vp80-00-comprehensive-009.webp -OK. 3796a852 test/3pdata/webpsuite/vp80-00-comprehensive-010.webp -OK. c42a950e test/3pdata/webpsuite/vp80-00-comprehensive-011.webp -OK. c42a950e test/3pdata/webpsuite/vp80-00-comprehensive-012.webp -OK. c42a950e test/3pdata/webpsuite/vp80-00-comprehensive-013.webp -OK. e3e955c2 test/3pdata/webpsuite/vp80-00-comprehensive-014.webp -OK. 3796a852 test/3pdata/webpsuite/vp80-00-comprehensive-015.webp -OK. c42a950e test/3pdata/webpsuite/vp80-00-comprehensive-016.webp -OK. c42a950e test/3pdata/webpsuite/vp80-00-comprehensive-017.webp -OK. c42a950e test/3pdata/webpsuite/vp80-01-intra-1400.webp -OK. 4937f445 test/3pdata/webpsuite/vp80-01-intra-1411.webp -OK. c42a950e test/3pdata/webpsuite/vp80-01-intra-1416.webp -OK. c42a950e test/3pdata/webpsuite/vp80-01-intra-1417.webp -OK. c42a950e test/3pdata/webpsuite/vp80-02-inter-1402.webp -OK. 4937f445 test/3pdata/webpsuite/vp80-02-inter-1412.webp -OK. 96b4ed67 test/3pdata/webpsuite/vp80-02-inter-1418.webp -OK. c42a950e test/3pdata/webpsuite/vp80-02-inter-1424.webp -OK. c42a950e test/3pdata/webpsuite/vp80-03-segmentation-1401.webp -OK. c42a950e test/3pdata/webpsuite/vp80-03-segmentation-1403.webp -OK. 1187f564 test/3pdata/webpsuite/vp80-03-segmentation-1407.webp -OK. 1187f564 test/3pdata/webpsuite/vp80-03-segmentation-1408.webp -OK. 1187f564 test/3pdata/webpsuite/vp80-03-segmentation-1409.webp -OK. 1187f564 test/3pdata/webpsuite/vp80-03-segmentation-1410.webp -OK. 4937f445 test/3pdata/webpsuite/vp80-03-segmentation-1413.webp -OK. 3796a852 test/3pdata/webpsuite/vp80-03-segmentation-1414.webp -OK. 3796a852 test/3pdata/webpsuite/vp80-03-segmentation-1415.webp -OK. c42a950e test/3pdata/webpsuite/vp80-03-segmentation-1425.webp -OK. 1187f564 test/3pdata/webpsuite/vp80-03-segmentation-1426.webp -OK. 1187f564 test/3pdata/webpsuite/vp80-03-segmentation-1427.webp -OK. 1187f564 test/3pdata/webpsuite/vp80-03-segmentation-1432.webp -OK. 1187f564 test/3pdata/webpsuite/vp80-03-segmentation-1435.webp -OK. 1187f564 test/3pdata/webpsuite/vp80-03-segmentation-1436.webp -OK. 1187f564 test/3pdata/webpsuite/vp80-03-segmentation-1437.webp -OK. 1187f564 test/3pdata/webpsuite/vp80-03-segmentation-1441.webp -OK. 1187f564 test/3pdata/webpsuite/vp80-03-segmentation-1442.webp -OK. c42a950e test/3pdata/webpsuite/vp80-04-partitions-1404.webp -OK. c42a950e test/3pdata/webpsuite/vp80-04-partitions-1405.webp -OK. c42a950e test/3pdata/webpsuite/vp80-04-partitions-1406.webp -OK. 1187f564 test/3pdata/webpsuite/vp80-05-sharpness-1428.webp -OK. 1187f564 test/3pdata/webpsuite/vp80-05-sharpness-1429.webp -OK. 1187f564 test/3pdata/webpsuite/vp80-05-sharpness-1430.webp -OK. 1187f564 test/3pdata/webpsuite/vp80-05-sharpness-1431.webp -OK. 1187f564 test/3pdata/webpsuite/vp80-05-sharpness-1433.webp -OK. 1187f564 test/3pdata/webpsuite/vp80-05-sharpness-1434.webp -OK. 1187f564 test/3pdata/webpsuite/vp80-05-sharpness-1438.webp -OK. 1187f564 test/3pdata/webpsuite/vp80-05-sharpness-1439.webp -OK. 1187f564 test/3pdata/webpsuite/vp80-05-sharpness-1440.webp -OK. 35ab76d3 test/3pdata/webpsuite/vp80-05-sharpness-1443.webp +OK. 3962d4f8 test/3pdata/webpsuite/segment01.webp +OK. 57f4200f test/3pdata/webpsuite/segment02.webp +OK. a0b740dd test/3pdata/webpsuite/segment03.webp +OK. cd4ae382 test/3pdata/webpsuite/small_13x1.webp +OK. 1dfeaa2c test/3pdata/webpsuite/small_1x1.webp +OK. fcb05cbe test/3pdata/webpsuite/small_1x13.webp +OK. 5a7d89b4 test/3pdata/webpsuite/small_31x13.webp +OK. d8aedf23 test/3pdata/webpsuite/test-nostrong.webp +OK. 2f7e9a6e test/3pdata/webpsuite/test.webp +OK. d0923a79 test/3pdata/webpsuite/very_short.webp +OK. aaea96fd test/3pdata/webpsuite/vp80-00-comprehensive-001.webp +OK. be18d791 test/3pdata/webpsuite/vp80-00-comprehensive-002.webp +OK. 99223d59 test/3pdata/webpsuite/vp80-00-comprehensive-003.webp +OK. aaea96fd test/3pdata/webpsuite/vp80-00-comprehensive-004.webp +OK. c88edfd9 test/3pdata/webpsuite/vp80-00-comprehensive-005.webp +OK. 5e946f93 test/3pdata/webpsuite/vp80-00-comprehensive-006.webp +OK. 3d16bda7 test/3pdata/webpsuite/vp80-00-comprehensive-007.webp +OK. d8ac59a7 test/3pdata/webpsuite/vp80-00-comprehensive-008.webp +OK. bbc097ad test/3pdata/webpsuite/vp80-00-comprehensive-009.webp +OK. 53fe88d6 test/3pdata/webpsuite/vp80-00-comprehensive-010.webp +OK. f70833d8 test/3pdata/webpsuite/vp80-00-comprehensive-011.webp +OK. 1d82b0b2 test/3pdata/webpsuite/vp80-00-comprehensive-012.webp +OK. 16ae163a test/3pdata/webpsuite/vp80-00-comprehensive-013.webp +OK. 037ea78a test/3pdata/webpsuite/vp80-00-comprehensive-014.webp +OK. 19667752 test/3pdata/webpsuite/vp80-00-comprehensive-015.webp +OK. 89c9c73d test/3pdata/webpsuite/vp80-00-comprehensive-016.webp +OK. a9f0017f test/3pdata/webpsuite/vp80-00-comprehensive-017.webp +OK. 013e93bd test/3pdata/webpsuite/vp80-01-intra-1400.webp +OK. 94c57a08 test/3pdata/webpsuite/vp80-01-intra-1411.webp +OK. be24b089 test/3pdata/webpsuite/vp80-01-intra-1416.webp +OK. 7dc6062e test/3pdata/webpsuite/vp80-01-intra-1417.webp +OK. 013e93bd test/3pdata/webpsuite/vp80-02-inter-1402.webp +OK. 94c57a08 test/3pdata/webpsuite/vp80-02-inter-1412.webp +OK. 67711d5e test/3pdata/webpsuite/vp80-02-inter-1418.webp +OK. dbfca331 test/3pdata/webpsuite/vp80-02-inter-1424.webp +OK. 013e93bd test/3pdata/webpsuite/vp80-03-segmentation-1401.webp +OK. 013e93bd test/3pdata/webpsuite/vp80-03-segmentation-1403.webp +OK. 58e9b437 test/3pdata/webpsuite/vp80-03-segmentation-1407.webp +OK. 58e9b437 test/3pdata/webpsuite/vp80-03-segmentation-1408.webp +OK. 58e9b437 test/3pdata/webpsuite/vp80-03-segmentation-1409.webp +OK. 58e9b437 test/3pdata/webpsuite/vp80-03-segmentation-1410.webp +OK. 94c57a08 test/3pdata/webpsuite/vp80-03-segmentation-1413.webp +OK. 25937bf3 test/3pdata/webpsuite/vp80-03-segmentation-1414.webp +OK. 432dec58 test/3pdata/webpsuite/vp80-03-segmentation-1415.webp +OK. 7f46998c test/3pdata/webpsuite/vp80-03-segmentation-1425.webp +OK. 58de6882 test/3pdata/webpsuite/vp80-03-segmentation-1426.webp +OK. d05f9538 test/3pdata/webpsuite/vp80-03-segmentation-1427.webp +OK. d81e0de6 test/3pdata/webpsuite/vp80-03-segmentation-1432.webp +OK. 1c1a3c97 test/3pdata/webpsuite/vp80-03-segmentation-1435.webp +OK. 0ec9a0e9 test/3pdata/webpsuite/vp80-03-segmentation-1436.webp +OK. 2c898efc test/3pdata/webpsuite/vp80-03-segmentation-1437.webp +OK. d8bb20a2 test/3pdata/webpsuite/vp80-03-segmentation-1441.webp +OK. 51272070 test/3pdata/webpsuite/vp80-03-segmentation-1442.webp +OK. 013e93bd test/3pdata/webpsuite/vp80-04-partitions-1404.webp +OK. 013e93bd test/3pdata/webpsuite/vp80-04-partitions-1405.webp +OK. 013e93bd test/3pdata/webpsuite/vp80-04-partitions-1406.webp +OK. 712a8a5c test/3pdata/webpsuite/vp80-05-sharpness-1428.webp +OK. 393b458f test/3pdata/webpsuite/vp80-05-sharpness-1429.webp +OK. be3d8a75 test/3pdata/webpsuite/vp80-05-sharpness-1430.webp +OK. 30ecc9b1 test/3pdata/webpsuite/vp80-05-sharpness-1431.webp +OK. 9b64969a test/3pdata/webpsuite/vp80-05-sharpness-1433.webp +OK. 92da617c test/3pdata/webpsuite/vp80-05-sharpness-1434.webp +OK. 5c0e9903 test/3pdata/webpsuite/vp80-05-sharpness-1438.webp +OK. 299049d0 test/3pdata/webpsuite/vp80-05-sharpness-1439.webp +OK. 9b64969a test/3pdata/webpsuite/vp80-05-sharpness-1440.webp +OK. 5d040f18 test/3pdata/webpsuite/vp80-05-sharpness-1443.webp diff --git a/test/c/std/webp.c b/test/c/std/webp.c index be0a2cad..75be6ac4 100644 --- a/test/c/std/webp.c +++ b/test/c/std/webp.c @@ -111,7 +111,7 @@ test_wuffs_webp_decode_interface_lossy() { WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED)); return do_test__wuffs_base__image_decoder( wuffs_webp__decoder__upcast_as__wuffs_base__image_decoder(dec), - "test/data/bricks-color.lossy.webp", 0, SIZE_MAX, 160, 120, 0xFF9F7780); + "test/data/bricks-color.lossy.webp", 0, SIZE_MAX, 160, 120, 0xFF493D65); } const char* // @@ -200,8 +200,8 @@ test_wuffs_webp_decode_many_small_reads() { wuffs_base__color_u32_argb_premul last_pixel = wuffs_base__pixel_buffer__color_u32_at(&pb, w - 1, h - 1); - if (last_pixel != 0xFF141F80) { - RETURN_FAIL("last_pixel: have 0x%" PRIX32 ", want 0xFF141F80", last_pixel); + if (last_pixel != 0xFF2D1922) { + RETURN_FAIL("last_pixel: have 0x%" PRIX32 ", want 0xFF2D1922", last_pixel); } return NULL; diff --git a/test/nia-checksums-of-data.txt b/test/nia-checksums-of-data.txt index 3e531f0e..b7d61345 100644 --- a/test/nia-checksums-of-data.txt +++ b/test/nia-checksums-of-data.txt @@ -65,7 +65,7 @@ OK. 41e6110e test/data/bricks-color.etc1s.pkm OK. 5670f263 test/data/bricks-color.etc2.pkm OK. 72a1f9cc test/data/bricks-color.jpeg OK. 076cb375 test/data/bricks-color.lossless.webp -OK. 9d451b1c test/data/bricks-color.lossy.webp +OK. 4af3fcf2 test/data/bricks-color.lossy.webp OK. 076cb375 test/data/bricks-color.png OK. 076cb375 test/data/bricks-color.qoi OK. 076cb375 test/data/bricks-color.tga @@ -83,7 +83,7 @@ OK. 6065d955 test/data/bricks-gray.c3q4.handsum OK. c2bce675 test/data/bricks-gray.gif OK. 3a2478ad test/data/bricks-gray.jpeg OK. c2bce675 test/data/bricks-gray.lossless.webp -OK. 9d451b1c test/data/bricks-gray.lossy.webp +OK. fc0d7a27 test/data/bricks-gray.lossy.webp OK. c2bce675 test/data/bricks-gray.no-ancillary.png OK. c2bce675 test/data/bricks-gray.png OK. c2bce675 test/data/bricks-gray.tga @@ -102,26 +102,26 @@ OK. 030f5a48 test/data/harvesters.bmp OK. c18b3d5a test/data/harvesters.gif OK. f217df74 test/data/harvesters.jpeg OK. 030f5a48 test/data/harvesters.lossless.webp -OK. a0a736f4 test/data/harvesters.lossy.webp +OK. f94319e2 test/data/harvesters.lossy.webp OK. 030f5a48 test/data/harvesters.png OK. e776c90f test/data/hat.bmp OK. 6dcba6a4 test/data/hat.gif OK. 2298f3ca test/data/hat.jpeg OK. e776c90f test/data/hat.lossless.webp -OK. 50993e8b test/data/hat.lossy.webp +OK. c1de0598 test/data/hat.lossy.webp OK. e776c90f test/data/hat.png OK. d30bfe5d test/data/hat.wbmp OK. 33a44f22 test/data/hibiscus.primitive.bmp OK. 25e212b3 test/data/hibiscus.primitive.gif OK. 9624fa44 test/data/hibiscus.primitive.jpeg OK. 33a44f22 test/data/hibiscus.primitive.lossless.webp -OK. 607f05b1 test/data/hibiscus.primitive.lossy.webp +OK. 8fa195d4 test/data/hibiscus.primitive.lossy.webp OK. 33a44f22 test/data/hibiscus.primitive.png OK. 60040742 test/data/hibiscus.regular.bmp OK. b727da8b test/data/hibiscus.regular.gif OK. 41e39405 test/data/hibiscus.regular.jpeg OK. 60040742 test/data/hibiscus.regular.lossless.webp -OK. 607f05b1 test/data/hibiscus.regular.lossy.webp +OK. a88f76df test/data/hibiscus.regular.lossy.webp OK. 60040742 test/data/hibiscus.regular.png OK. dcbb225a test/data/hippopotamus.bmp OK. ed4b78fc test/data/hippopotamus.interlaced.gif @@ -130,7 +130,7 @@ BAD c3c4bd65 test/data/hippopotamus.interlaced.truncated.gif BAD 3feec847 test/data/hippopotamus.interlaced.truncated.png OK. 96bdbbb3 test/data/hippopotamus.jpeg OK. dcbb225a test/data/hippopotamus.lossless.webp -OK. d5577434 test/data/hippopotamus.lossy.webp +OK. 464cd736 test/data/hippopotamus.lossy.webp OK. 2535637e test/data/hippopotamus.masked-with-muybridge.etc2.bgra-binary.pkm OK. 720180ee test/data/hippopotamus.masked-with-muybridge.etc2.bgra-nonpremul.pkm OK. d3bbed27 test/data/hippopotamus.masked-with-muybridge.gif @@ -146,12 +146,12 @@ OK. 39d18fce test/data/mona-lisa.21x32.c3q4.handsum OK. f6bb81e2 test/data/mona-lisa.21x32.etc2.pkm OK. 012ce4cf test/data/mona-lisa.21x32.lossless.webp OK. 012ce4cf test/data/mona-lisa.21x32.png -OK. e8aeb873 test/data/mona-lisa.21x32.q0.lossy.webp -OK. e8aeb873 test/data/mona-lisa.21x32.q25.lossy.webp +OK. 6e682e48 test/data/mona-lisa.21x32.q0.lossy.webp +OK. 1b56acf3 test/data/mona-lisa.21x32.q25.lossy.webp OK. 0a22e689 test/data/mona-lisa.21x32.q50.jpeg -OK. e8aeb873 test/data/mona-lisa.21x32.q50.lossy.webp +OK. a6a79d62 test/data/mona-lisa.21x32.q50.lossy.webp OK. 059ecb80 test/data/mona-lisa.21x32.q90.jpeg -OK. e8aeb873 test/data/mona-lisa.21x32.q90.lossy.webp +OK. c75e9677 test/data/mona-lisa.21x32.q90.lossy.webp OK. 012ce4cf test/data/mona-lisa.21x32.qoi OK. 12fc69a5 test/data/mona-lisa.21x32.th OK. 2dccfe56 test/data/muybridge-frame-000.wbmp @@ -191,7 +191,7 @@ OK. bf7e8c96 test/data/pjw-thumbnail.bmp OK. bf7e8c96 test/data/pjw-thumbnail.gif OK. 7c67a37f test/data/pjw-thumbnail.jpeg OK. bf7e8c96 test/data/pjw-thumbnail.lossless.webp -OK. 61f9ea55 test/data/pjw-thumbnail.lossy.webp +OK. cca25579 test/data/pjw-thumbnail.lossy.webp OK. bf7e8c96 test/data/pjw-thumbnail.png OK. 38cb4cbf test/data/red-blue-gradient.dcip3d65-no-chrm-no-gama.png OK. 38cb4cbf test/data/red-blue-gradient.gamma1dot0.png