diff --git a/release/c/wuffs-unsupported-snapshot.c b/release/c/wuffs-unsupported-snapshot.c index c0457f64..7132b960 100644 --- a/release/c/wuffs-unsupported-snapshot.c +++ b/release/c/wuffs-unsupported-snapshot.c @@ -33608,76 +33608,6 @@ wuffs_png__decoder__decode_pass( return status; } -// -------- func png.decoder.filter_and_swizzle - -static wuffs_base__status -wuffs_png__decoder__filter_and_swizzle( - wuffs_png__decoder* self, - wuffs_base__pixel_buffer* a_dst, - wuffs_base__slice_u8 a_workbuf) { - return (*self->private_impl.choosy_filter_and_swizzle)(self, a_dst, a_workbuf); -} - -static wuffs_base__status -wuffs_png__decoder__filter_and_swizzle__choosy_default( - wuffs_png__decoder* self, - wuffs_base__pixel_buffer* a_dst, - wuffs_base__slice_u8 a_workbuf) { - wuffs_base__pixel_format v_dst_pixfmt = {0}; - uint32_t v_dst_bits_per_pixel = 0; - uint64_t v_dst_bytes_per_pixel = 0; - uint64_t v_dst_bytes_per_row = 0; - wuffs_base__slice_u8 v_dst_palette = {0}; - wuffs_base__table_u8 v_tab = {0}; - uint32_t v_y = 0; - wuffs_base__slice_u8 v_dst = {0}; - uint8_t v_filter = 0; - wuffs_base__slice_u8 v_curr_row = {0}; - wuffs_base__slice_u8 v_prev_row = {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 & 7) != 0) { - return wuffs_base__make_status(wuffs_base__error__unsupported_option); - } - v_dst_bytes_per_pixel = ((uint64_t)((v_dst_bits_per_pixel / 8))); - v_dst_bytes_per_row = (((uint64_t)(self->private_impl.f_width)) * v_dst_bytes_per_pixel); - v_dst_palette = wuffs_base__pixel_buffer__palette_or_else(a_dst, wuffs_base__make_slice_u8(self->private_data.f_dst_palette, 1024)); - v_tab = wuffs_base__pixel_buffer__plane(a_dst, 0); - while (v_y < self->private_impl.f_height) { - v_dst = wuffs_base__table_u8__row(v_tab, v_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); - } - if (1 > ((uint64_t)(a_workbuf.len))) { - return wuffs_base__make_status(wuffs_png__error__internal_error_inconsistent_workbuf_length); - } - v_filter = a_workbuf.ptr[0]; - a_workbuf = wuffs_base__slice_u8__subslice_i(a_workbuf, 1); - if (self->private_impl.f_pass_bytes_per_row > ((uint64_t)(a_workbuf.len))) { - return wuffs_base__make_status(wuffs_png__error__internal_error_inconsistent_workbuf_length); - } - v_curr_row = wuffs_base__slice_u8__subslice_j(a_workbuf, self->private_impl.f_pass_bytes_per_row); - a_workbuf = wuffs_base__slice_u8__subslice_i(a_workbuf, self->private_impl.f_pass_bytes_per_row); - if (v_filter == 0) { - } else if (v_filter == 1) { - wuffs_png__decoder__filter_1(self, v_curr_row); - } else if (v_filter == 2) { - wuffs_png__decoder__filter_2(self, v_curr_row, v_prev_row); - } else if (v_filter == 3) { - wuffs_png__decoder__filter_3(self, v_curr_row, v_prev_row); - } else if (v_filter == 4) { - wuffs_png__decoder__filter_4(self, v_curr_row, v_prev_row); - } else { - return wuffs_base__make_status(wuffs_png__error__bad_filter); - } - wuffs_base__pixel_swizzler__swizzle_interleaved_from_slice(&self->private_impl.f_swizzler, v_dst, v_dst_palette, v_curr_row); - v_prev_row = v_curr_row; - v_y += 1; - } - return wuffs_base__make_status(NULL); -} - // -------- func png.decoder.frame_dirty_rect WUFFS_BASE__MAYBE_STATIC wuffs_base__rect_ie_u32 @@ -33851,6 +33781,76 @@ wuffs_png__decoder__workbuf_len( return wuffs_base__utility__make_range_ii_u64(self->private_impl.f_overall_workbuf_length, self->private_impl.f_overall_workbuf_length); } +// -------- func png.decoder.filter_and_swizzle + +static wuffs_base__status +wuffs_png__decoder__filter_and_swizzle( + wuffs_png__decoder* self, + wuffs_base__pixel_buffer* a_dst, + wuffs_base__slice_u8 a_workbuf) { + return (*self->private_impl.choosy_filter_and_swizzle)(self, a_dst, a_workbuf); +} + +static wuffs_base__status +wuffs_png__decoder__filter_and_swizzle__choosy_default( + wuffs_png__decoder* self, + wuffs_base__pixel_buffer* a_dst, + wuffs_base__slice_u8 a_workbuf) { + wuffs_base__pixel_format v_dst_pixfmt = {0}; + uint32_t v_dst_bits_per_pixel = 0; + uint64_t v_dst_bytes_per_pixel = 0; + uint64_t v_dst_bytes_per_row = 0; + wuffs_base__slice_u8 v_dst_palette = {0}; + wuffs_base__table_u8 v_tab = {0}; + uint32_t v_y = 0; + wuffs_base__slice_u8 v_dst = {0}; + uint8_t v_filter = 0; + wuffs_base__slice_u8 v_curr_row = {0}; + wuffs_base__slice_u8 v_prev_row = {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 & 7) != 0) { + return wuffs_base__make_status(wuffs_base__error__unsupported_option); + } + v_dst_bytes_per_pixel = ((uint64_t)((v_dst_bits_per_pixel / 8))); + v_dst_bytes_per_row = (((uint64_t)(self->private_impl.f_width)) * v_dst_bytes_per_pixel); + v_dst_palette = wuffs_base__pixel_buffer__palette_or_else(a_dst, wuffs_base__make_slice_u8(self->private_data.f_dst_palette, 1024)); + v_tab = wuffs_base__pixel_buffer__plane(a_dst, 0); + while (v_y < self->private_impl.f_height) { + v_dst = wuffs_base__table_u8__row(v_tab, v_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); + } + if (1 > ((uint64_t)(a_workbuf.len))) { + return wuffs_base__make_status(wuffs_png__error__internal_error_inconsistent_workbuf_length); + } + v_filter = a_workbuf.ptr[0]; + a_workbuf = wuffs_base__slice_u8__subslice_i(a_workbuf, 1); + if (self->private_impl.f_pass_bytes_per_row > ((uint64_t)(a_workbuf.len))) { + return wuffs_base__make_status(wuffs_png__error__internal_error_inconsistent_workbuf_length); + } + v_curr_row = wuffs_base__slice_u8__subslice_j(a_workbuf, self->private_impl.f_pass_bytes_per_row); + a_workbuf = wuffs_base__slice_u8__subslice_i(a_workbuf, self->private_impl.f_pass_bytes_per_row); + if (v_filter == 0) { + } else if (v_filter == 1) { + wuffs_png__decoder__filter_1(self, v_curr_row); + } else if (v_filter == 2) { + wuffs_png__decoder__filter_2(self, v_curr_row, v_prev_row); + } else if (v_filter == 3) { + wuffs_png__decoder__filter_3(self, v_curr_row, v_prev_row); + } else if (v_filter == 4) { + wuffs_png__decoder__filter_4(self, v_curr_row, v_prev_row); + } else { + return wuffs_base__make_status(wuffs_png__error__bad_filter); + } + wuffs_base__pixel_swizzler__swizzle_interleaved_from_slice(&self->private_impl.f_swizzler, v_dst, v_dst_palette, v_curr_row); + v_prev_row = v_curr_row; + v_y += 1; + } + return wuffs_base__make_status(NULL); +} + // -------- func png.decoder.filter_and_swizzle_tricky static wuffs_base__status diff --git a/std/png/decode_png.wuffs b/std/png/decode_png.wuffs index b3603b89..dd776265 100644 --- a/std/png/decode_png.wuffs +++ b/std/png/decode_png.wuffs @@ -632,78 +632,6 @@ pri func decoder.decode_pass?(src: base.io_reader, workbuf: slice base.u8) { } } -pri func decoder.filter_and_swizzle!(dst: ptr base.pixel_buffer, workbuf: slice base.u8) base.status, - choosy, -{ - var dst_pixfmt : base.pixel_format - var dst_bits_per_pixel : base.u32[..= 256] - var dst_bytes_per_pixel : base.u64[..= 32] - var dst_bytes_per_row : base.u64 - var dst_palette : slice base.u8 - var tab : table base.u8 - - var y : base.u32 - var dst : slice base.u8 - var filter : base.u8 - var curr_row : slice base.u8 - var prev_row : slice 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) as base.u64 - dst_bytes_per_row = (this.width as base.u64) * dst_bytes_per_pixel - dst_palette = args.dst.palette_or_else(fallback: this.dst_palette[..]) - tab = args.dst.plane(p: 0) - - while y < this.height { - assert y < 0x00FF_FFFF via "a < b: a < c; c <= b"(c: this.height) - dst = tab.row(y: y) - if dst_bytes_per_row < dst.length() { - dst = dst[.. dst_bytes_per_row] - } - - if 1 > args.workbuf.length() { - return "#internal error: inconsistent workbuf length" - } - filter = args.workbuf[0] - args.workbuf = args.workbuf[1 ..] - if this.pass_bytes_per_row > args.workbuf.length() { - return "#internal error: inconsistent workbuf length" - } - curr_row = args.workbuf[.. this.pass_bytes_per_row] - args.workbuf = args.workbuf[this.pass_bytes_per_row ..] - - if filter == 0 { - // No-op. - } else if filter == 1 { - this.filter_1!(curr: curr_row) - } else if filter == 2 { - this.filter_2!(curr: curr_row, prev: prev_row) - } else if filter == 3 { - this.filter_3!(curr: curr_row, prev: prev_row) - } else if filter == 4 { - this.filter_4!(curr: curr_row, prev: prev_row) - } else { - return "#bad filter" - } - - this.swizzler.swizzle_interleaved_from_slice!( - dst: dst, - dst_palette: dst_palette, - src: curr_row) - - prev_row = curr_row - y += 1 - } endwhile - - 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/std/png/decode_swizzle_fallback.wuffs b/std/png/decode_swizzle_fallback.wuffs new file mode 100644 index 00000000..01103483 --- /dev/null +++ b/std/png/decode_swizzle_fallback.wuffs @@ -0,0 +1,85 @@ +// Copyright 2020 The Wuffs Authors. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// https://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +pri func decoder.filter_and_swizzle!(dst: ptr base.pixel_buffer, workbuf: slice base.u8) base.status, + choosy, +{ + var dst_pixfmt : base.pixel_format + var dst_bits_per_pixel : base.u32[..= 256] + var dst_bytes_per_pixel : base.u64[..= 32] + var dst_bytes_per_row : base.u64 + var dst_palette : slice base.u8 + var tab : table base.u8 + + var y : base.u32 + var dst : slice base.u8 + var filter : base.u8 + var curr_row : slice base.u8 + var prev_row : slice 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) as base.u64 + dst_bytes_per_row = (this.width as base.u64) * dst_bytes_per_pixel + dst_palette = args.dst.palette_or_else(fallback: this.dst_palette[..]) + tab = args.dst.plane(p: 0) + + while y < this.height { + assert y < 0x00FF_FFFF via "a < b: a < c; c <= b"(c: this.height) + dst = tab.row(y: y) + if dst_bytes_per_row < dst.length() { + dst = dst[.. dst_bytes_per_row] + } + + if 1 > args.workbuf.length() { + return "#internal error: inconsistent workbuf length" + } + filter = args.workbuf[0] + args.workbuf = args.workbuf[1 ..] + if this.pass_bytes_per_row > args.workbuf.length() { + return "#internal error: inconsistent workbuf length" + } + curr_row = args.workbuf[.. this.pass_bytes_per_row] + args.workbuf = args.workbuf[this.pass_bytes_per_row ..] + + if filter == 0 { + // No-op. + } else if filter == 1 { + this.filter_1!(curr: curr_row) + } else if filter == 2 { + this.filter_2!(curr: curr_row, prev: prev_row) + } else if filter == 3 { + this.filter_3!(curr: curr_row, prev: prev_row) + } else if filter == 4 { + this.filter_4!(curr: curr_row, prev: prev_row) + } else { + return "#bad filter" + } + + this.swizzler.swizzle_interleaved_from_slice!( + dst: dst, + dst_palette: dst_palette, + src: curr_row) + + prev_row = curr_row + y += 1 + } endwhile + + return ok +}