diff --git a/release/c/wuffs-unsupported-snapshot.c b/release/c/wuffs-unsupported-snapshot.c index 61c7dda9..d00cd1e2 100644 --- a/release/c/wuffs-unsupported-snapshot.c +++ b/release/c/wuffs-unsupported-snapshot.c @@ -29850,6 +29850,11 @@ wuffs_png__decoder__filter_1__choosy_default( wuffs_png__decoder* self, wuffs_base__slice_u8 a_curr); +static wuffs_base__empty_struct +wuffs_png__decoder__filter_1_distance_3_fallback( + wuffs_png__decoder* self, + wuffs_base__slice_u8 a_curr); + static wuffs_base__empty_struct wuffs_png__decoder__filter_1_distance_4_fallback( wuffs_png__decoder* self, @@ -29879,6 +29884,12 @@ wuffs_png__decoder__filter_3__choosy_default( wuffs_base__slice_u8 a_curr, wuffs_base__slice_u8 a_prev); +static wuffs_base__empty_struct +wuffs_png__decoder__filter_3_distance_3_fallback( + wuffs_png__decoder* self, + wuffs_base__slice_u8 a_curr, + wuffs_base__slice_u8 a_prev); + static wuffs_base__empty_struct wuffs_png__decoder__filter_3_distance_4_fallback( wuffs_png__decoder* self, @@ -29897,6 +29908,12 @@ wuffs_png__decoder__filter_4__choosy_default( wuffs_base__slice_u8 a_curr, wuffs_base__slice_u8 a_prev); +static wuffs_base__empty_struct +wuffs_png__decoder__filter_4_distance_3_fallback( + wuffs_png__decoder* self, + wuffs_base__slice_u8 a_curr, + wuffs_base__slice_u8 a_prev); + static wuffs_base__empty_struct wuffs_png__decoder__filter_4_distance_4_fallback( wuffs_png__decoder* self, @@ -30077,6 +30094,35 @@ wuffs_png__decoder__filter_1__choosy_default( return wuffs_base__make_empty_struct(); } +// -------- func png.decoder.filter_1_distance_3_fallback + +static wuffs_base__empty_struct +wuffs_png__decoder__filter_1_distance_3_fallback( + wuffs_png__decoder* self, + wuffs_base__slice_u8 a_curr) { + wuffs_base__slice_u8 v_c = {0}; + uint8_t v_fa0 = 0; + uint8_t v_fa1 = 0; + uint8_t v_fa2 = 0; + + { + wuffs_base__slice_u8 i_slice_c = a_curr; + v_c = i_slice_c; + v_c.len = 3; + uint8_t* i_end0_c = i_slice_c.ptr + (i_slice_c.len / 3) * 3; + while (v_c.ptr < i_end0_c) { + v_fa0 += v_c.ptr[0]; + v_c.ptr[0] = v_fa0; + v_fa1 += v_c.ptr[1]; + v_c.ptr[1] = v_fa1; + v_fa2 += v_c.ptr[2]; + v_c.ptr[2] = v_fa2; + v_c.ptr += 3; + } + } + return wuffs_base__make_empty_struct(); +} + // -------- func png.decoder.filter_1_distance_4_fallback static wuffs_base__empty_struct @@ -30178,6 +30224,60 @@ wuffs_png__decoder__filter_3__choosy_default( return wuffs_base__make_empty_struct(); } +// -------- func png.decoder.filter_3_distance_3_fallback + +static wuffs_base__empty_struct +wuffs_png__decoder__filter_3_distance_3_fallback( + wuffs_png__decoder* self, + wuffs_base__slice_u8 a_curr, + wuffs_base__slice_u8 a_prev) { + wuffs_base__slice_u8 v_c = {0}; + wuffs_base__slice_u8 v_p = {0}; + uint8_t v_fa0 = 0; + uint8_t v_fa1 = 0; + uint8_t v_fa2 = 0; + + if (((uint64_t)(a_prev.len)) == 0) { + { + wuffs_base__slice_u8 i_slice_c = a_curr; + v_c = i_slice_c; + v_c.len = 3; + uint8_t* i_end0_c = i_slice_c.ptr + (i_slice_c.len / 3) * 3; + while (v_c.ptr < i_end0_c) { + v_fa0 = ((v_fa0 / 2) + v_c.ptr[0]); + v_c.ptr[0] = v_fa0; + v_fa1 = ((v_fa1 / 2) + v_c.ptr[1]); + v_c.ptr[1] = v_fa1; + v_fa2 = ((v_fa2 / 2) + v_c.ptr[2]); + v_c.ptr[2] = v_fa2; + v_c.ptr += 3; + } + } + } else { + { + wuffs_base__slice_u8 i_slice_c = a_curr; + v_c = i_slice_c; + wuffs_base__slice_u8 i_slice_p = a_prev; + v_p = i_slice_p; + i_slice_c.len = wuffs_base__u64__min(i_slice_c.len, i_slice_p.len); + v_c.len = 3; + v_p.len = 3; + uint8_t* i_end0_c = i_slice_c.ptr + (i_slice_c.len / 3) * 3; + while (v_c.ptr < i_end0_c) { + v_fa0 = (((uint8_t)(((((uint32_t)(v_fa0)) + ((uint32_t)(v_p.ptr[0]))) / 2))) + v_c.ptr[0]); + v_c.ptr[0] = v_fa0; + v_fa1 = (((uint8_t)(((((uint32_t)(v_fa1)) + ((uint32_t)(v_p.ptr[1]))) / 2))) + v_c.ptr[1]); + v_c.ptr[1] = v_fa1; + v_fa2 = (((uint8_t)(((((uint32_t)(v_fa2)) + ((uint32_t)(v_p.ptr[2]))) / 2))) + v_c.ptr[2]); + v_c.ptr[2] = v_fa2; + v_c.ptr += 3; + v_p.ptr += 3; + } + } + } + return wuffs_base__make_empty_struct(); +} + // -------- func png.decoder.filter_3_distance_4_fallback static wuffs_base__empty_struct @@ -30300,6 +30400,123 @@ wuffs_png__decoder__filter_4__choosy_default( return wuffs_base__make_empty_struct(); } +// -------- func png.decoder.filter_4_distance_3_fallback + +static wuffs_base__empty_struct +wuffs_png__decoder__filter_4_distance_3_fallback( + wuffs_png__decoder* self, + wuffs_base__slice_u8 a_curr, + wuffs_base__slice_u8 a_prev) { + wuffs_base__slice_u8 v_c = {0}; + wuffs_base__slice_u8 v_p = {0}; + uint32_t v_fa0 = 0; + uint32_t v_fa1 = 0; + uint32_t v_fa2 = 0; + uint32_t v_fb0 = 0; + uint32_t v_fb1 = 0; + uint32_t v_fb2 = 0; + uint32_t v_fc0 = 0; + uint32_t v_fc1 = 0; + uint32_t v_fc2 = 0; + uint32_t v_pp0 = 0; + uint32_t v_pp1 = 0; + uint32_t v_pp2 = 0; + uint32_t v_pa0 = 0; + uint32_t v_pa1 = 0; + uint32_t v_pa2 = 0; + uint32_t v_pb0 = 0; + uint32_t v_pb1 = 0; + uint32_t v_pb2 = 0; + uint32_t v_pc0 = 0; + uint32_t v_pc1 = 0; + uint32_t v_pc2 = 0; + + { + wuffs_base__slice_u8 i_slice_c = a_curr; + v_c = i_slice_c; + wuffs_base__slice_u8 i_slice_p = a_prev; + v_p = i_slice_p; + i_slice_c.len = wuffs_base__u64__min(i_slice_c.len, i_slice_p.len); + v_c.len = 3; + v_p.len = 3; + uint8_t* i_end0_c = i_slice_c.ptr + (i_slice_c.len / 3) * 3; + while (v_c.ptr < i_end0_c) { + v_fb0 = ((uint32_t)(v_p.ptr[0])); + v_pp0 = ((v_fa0 + v_fb0) - v_fc0); + v_pa0 = (v_pp0 - v_fa0); + if (v_pa0 >= 2147483648) { + v_pa0 = (0 - v_pa0); + } + v_pb0 = (v_pp0 - v_fb0); + if (v_pb0 >= 2147483648) { + v_pb0 = (0 - v_pb0); + } + v_pc0 = (v_pp0 - v_fc0); + if (v_pc0 >= 2147483648) { + v_pc0 = (0 - v_pc0); + } + if ((v_pa0 <= v_pb0) && (v_pa0 <= v_pc0)) { + } else if (v_pb0 <= v_pc0) { + v_fa0 = v_fb0; + } else { + v_fa0 = v_fc0; + } + v_c.ptr[0] += ((uint8_t)((v_fa0 & 255))); + v_fa0 = ((uint32_t)(v_c.ptr[0])); + v_fc0 = v_fb0; + v_fb1 = ((uint32_t)(v_p.ptr[1])); + v_pp1 = ((v_fa1 + v_fb1) - v_fc1); + v_pa1 = (v_pp1 - v_fa1); + if (v_pa1 >= 2147483648) { + v_pa1 = (0 - v_pa1); + } + v_pb1 = (v_pp1 - v_fb1); + if (v_pb1 >= 2147483648) { + v_pb1 = (0 - v_pb1); + } + v_pc1 = (v_pp1 - v_fc1); + if (v_pc1 >= 2147483648) { + v_pc1 = (0 - v_pc1); + } + if ((v_pa1 <= v_pb1) && (v_pa1 <= v_pc1)) { + } else if (v_pb1 <= v_pc1) { + v_fa1 = v_fb1; + } else { + v_fa1 = v_fc1; + } + v_c.ptr[1] += ((uint8_t)((v_fa1 & 255))); + v_fa1 = ((uint32_t)(v_c.ptr[1])); + v_fc1 = v_fb1; + v_fb2 = ((uint32_t)(v_p.ptr[2])); + v_pp2 = ((v_fa2 + v_fb2) - v_fc2); + v_pa2 = (v_pp2 - v_fa2); + if (v_pa2 >= 2147483648) { + v_pa2 = (0 - v_pa2); + } + v_pb2 = (v_pp2 - v_fb2); + if (v_pb2 >= 2147483648) { + v_pb2 = (0 - v_pb2); + } + v_pc2 = (v_pp2 - v_fc2); + if (v_pc2 >= 2147483648) { + v_pc2 = (0 - v_pc2); + } + if ((v_pa2 <= v_pb2) && (v_pa2 <= v_pc2)) { + } else if (v_pb2 <= v_pc2) { + v_fa2 = v_fb2; + } else { + v_fa2 = v_fc2; + } + v_c.ptr[2] += ((uint8_t)((v_fa2 & 255))); + v_fa2 = ((uint32_t)(v_c.ptr[2])); + v_fc2 = v_fb2; + v_c.ptr += 3; + v_p.ptr += 3; + } + } + return wuffs_base__make_empty_struct(); +} + // -------- func png.decoder.filter_4_distance_4_fallback static wuffs_base__empty_struct @@ -30930,6 +31147,9 @@ static wuffs_base__empty_struct wuffs_png__decoder__choose_filter_implementations( wuffs_png__decoder* self) { if (self->private_impl.f_filter_distance == 3) { + self->private_impl.choosy_filter_1 = &wuffs_png__decoder__filter_1_distance_3_fallback; + self->private_impl.choosy_filter_3 = &wuffs_png__decoder__filter_3_distance_3_fallback; + self->private_impl.choosy_filter_4 = &wuffs_png__decoder__filter_4_distance_3_fallback; } else if (self->private_impl.f_filter_distance == 4) { self->private_impl.choosy_filter_1 = &wuffs_png__decoder__filter_1_distance_4_fallback; self->private_impl.choosy_filter_3 = &wuffs_png__decoder__filter_3_distance_4_fallback; diff --git a/std/png/decode_filter_fallback.wuffs b/std/png/decode_filter_fallback.wuffs index b879ea64..494bac4f 100644 --- a/std/png/decode_filter_fallback.wuffs +++ b/std/png/decode_filter_fallback.wuffs @@ -37,6 +37,22 @@ pri func decoder.filter_1!(curr: slice base.u8), } endwhile } +pri func decoder.filter_1_distance_3_fallback!(curr: slice base.u8) { + var c : slice base.u8 + var fa0 : base.u8 + var fa1 : base.u8 + var fa2 : base.u8 + + iterate (c = args.curr)(length: 3, unroll: 1) { + fa0 ~mod+= c[0] + c[0] = fa0 + fa1 ~mod+= c[1] + c[1] = fa1 + fa2 ~mod+= c[2] + c[2] = fa2 + } +} + pri func decoder.filter_1_distance_4_fallback!(curr: slice base.u8) { var c : slice base.u8 var fa0 : base.u8 @@ -131,6 +147,35 @@ pri func decoder.filter_3!(curr: slice base.u8, prev: slice base.u8), } } +pri func decoder.filter_3_distance_3_fallback!(curr: slice base.u8, prev: slice base.u8) { + var c : slice base.u8 + var p : slice base.u8 + var fa0 : base.u8 + var fa1 : base.u8 + var fa2 : base.u8 + + if args.prev.length() == 0 { + iterate (c = args.curr)(length: 3, unroll: 1) { + fa0 = (fa0 / 2) ~mod+ c[0] + c[0] = fa0 + fa1 = (fa1 / 2) ~mod+ c[1] + c[1] = fa1 + fa2 = (fa2 / 2) ~mod+ c[2] + c[2] = fa2 + } + + } else { + iterate (c = args.curr, p = args.prev)(length: 3, unroll: 1) { + fa0 = ((((fa0 as base.u32) + (p[0] as base.u32)) / 2) as base.u8) ~mod+ c[0] + c[0] = fa0 + fa1 = ((((fa1 as base.u32) + (p[1] as base.u32)) / 2) as base.u8) ~mod+ c[1] + c[1] = fa1 + fa2 = ((((fa2 as base.u32) + (p[2] as base.u32)) / 2) as base.u8) ~mod+ c[2] + c[2] = fa2 + } + } +} + pri func decoder.filter_3_distance_4_fallback!(curr: slice base.u8, prev: slice base.u8) { var c : slice base.u8 var p : slice base.u8 @@ -235,6 +280,109 @@ pri func decoder.filter_4!(curr: slice base.u8, prev: slice base.u8), } endwhile } +pri func decoder.filter_4_distance_3_fallback!(curr: slice base.u8, prev: slice base.u8) { + var c : slice base.u8 + var p : slice base.u8 + var fa0 : base.u32 + var fa1 : base.u32 + var fa2 : base.u32 + var fb0 : base.u32 + var fb1 : base.u32 + var fb2 : base.u32 + var fc0 : base.u32 + var fc1 : base.u32 + var fc2 : base.u32 + var pp0 : base.u32 + var pp1 : base.u32 + var pp2 : base.u32 + var pa0 : base.u32 + var pa1 : base.u32 + var pa2 : base.u32 + var pb0 : base.u32 + var pb1 : base.u32 + var pb2 : base.u32 + var pc0 : base.u32 + var pc1 : base.u32 + var pc2 : base.u32 + + iterate (c = args.curr, p = args.prev)(length: 3, unroll: 1) { + fb0 = p[0] as base.u32 + pp0 = (fa0 ~mod+ fb0) ~mod- fc0 + pa0 = pp0 ~mod- fa0 + if pa0 >= 0x8000_0000 { + pa0 = 0 ~mod- pa0 + } + pb0 = pp0 ~mod- fb0 + if pb0 >= 0x8000_0000 { + pb0 = 0 ~mod- pb0 + } + pc0 = pp0 ~mod- fc0 + if pc0 >= 0x8000_0000 { + pc0 = 0 ~mod- pc0 + } + if (pa0 <= pb0) and (pa0 <= pc0) { + // No-op. + } else if pb0 <= pc0 { + fa0 = fb0 + } else { + fa0 = fc0 + } + c[0] ~mod+= (fa0 & 0xFF) as base.u8 + fa0 = c[0] as base.u32 + fc0 = fb0 + + fb1 = p[1] as base.u32 + pp1 = (fa1 ~mod+ fb1) ~mod- fc1 + pa1 = pp1 ~mod- fa1 + if pa1 >= 0x8000_0000 { + pa1 = 0 ~mod- pa1 + } + pb1 = pp1 ~mod- fb1 + if pb1 >= 0x8000_0000 { + pb1 = 0 ~mod- pb1 + } + pc1 = pp1 ~mod- fc1 + if pc1 >= 0x8000_0000 { + pc1 = 0 ~mod- pc1 + } + if (pa1 <= pb1) and (pa1 <= pc1) { + // No-op. + } else if pb1 <= pc1 { + fa1 = fb1 + } else { + fa1 = fc1 + } + c[1] ~mod+= (fa1 & 0xFF) as base.u8 + fa1 = c[1] as base.u32 + fc1 = fb1 + + fb2 = p[2] as base.u32 + pp2 = (fa2 ~mod+ fb2) ~mod- fc2 + pa2 = pp2 ~mod- fa2 + if pa2 >= 0x8000_0000 { + pa2 = 0 ~mod- pa2 + } + pb2 = pp2 ~mod- fb2 + if pb2 >= 0x8000_0000 { + pb2 = 0 ~mod- pb2 + } + pc2 = pp2 ~mod- fc2 + if pc2 >= 0x8000_0000 { + pc2 = 0 ~mod- pc2 + } + if (pa2 <= pb2) and (pa2 <= pc2) { + // No-op. + } else if pb2 <= pc2 { + fa2 = fb2 + } else { + fa2 = fc2 + } + c[2] ~mod+= (fa2 & 0xFF) as base.u8 + fa2 = c[2] as base.u32 + fc2 = fb2 + } +} + pri func decoder.filter_4_distance_4_fallback!(curr: slice base.u8, prev: slice base.u8) { var c : slice base.u8 var p : slice base.u8 diff --git a/std/png/decode_png.wuffs b/std/png/decode_png.wuffs index 79d31008..b814892b 100644 --- a/std/png/decode_png.wuffs +++ b/std/png/decode_png.wuffs @@ -249,7 +249,9 @@ pri func decoder.choose_filter_implementations!() { // Filter 0 is a no-op. Filter 2, the up filter, should already vectorize // easily by a good optimizing C compiler. if this.filter_distance == 3 { - // TODO. + choose filter_1 = [filter_1_distance_3_fallback] + choose filter_3 = [filter_3_distance_3_fallback] + choose filter_4 = [filter_4_distance_3_fallback] } else if this.filter_distance == 4 { choose filter_1 = [filter_1_distance_4_fallback] choose filter_3 = [filter_3_distance_4_fallback]