From 10d4ff7532dcf5a96e71899604ba474c03fde076 Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Thu, 20 Jul 2023 11:22:06 +1000 Subject: [PATCH] pixconv: factor out swizzle_ycc__convert_func MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit name old speed new speed delta wuffs_jpeg_decode_19k_8bpp/clang11 368MB/s ± 0% 365MB/s ± 1% -0.75% (p=0.008 n=5+5) wuffs_jpeg_decode_30k_24bpp_progressive/clang11 231MB/s ± 0% 241MB/s ± 0% +4.47% (p=0.008 n=5+5) wuffs_jpeg_decode_30k_24bpp_sequential/clang11 470MB/s ± 0% 477MB/s ± 0% +1.35% (p=0.008 n=5+5) wuffs_jpeg_decode_77k_24bpp/clang11 416MB/s ± 0% 429MB/s ± 0% +3.14% (p=0.008 n=5+5) wuffs_jpeg_decode_552k_24bpp_420/clang11 433MB/s ± 0% 446MB/s ± 0% +3.02% (p=0.008 n=5+5) wuffs_jpeg_decode_552k_24bpp_444/clang11 646MB/s ± 0% 644MB/s ± 0% -0.39% (p=0.016 n=5+4) wuffs_jpeg_decode_4002k_24bpp/clang11 439MB/s ± 0% 458MB/s ± 0% +4.35% (p=0.008 n=5+5) wuffs_jpeg_decode_19k_8bpp/gcc10 364MB/s ± 0% 352MB/s ± 0% -3.49% (p=0.008 n=5+5) wuffs_jpeg_decode_30k_24bpp_progressive/gcc10 294MB/s ± 0% 295MB/s ± 0% +0.38% (p=0.008 n=5+5) wuffs_jpeg_decode_30k_24bpp_sequential/gcc10 680MB/s ± 0% 669MB/s ± 0% -1.58% (p=0.008 n=5+5) wuffs_jpeg_decode_77k_24bpp/gcc10 578MB/s ± 0% 567MB/s ± 0% -1.92% (p=0.008 n=5+5) wuffs_jpeg_decode_552k_24bpp_420/gcc10 622MB/s ± 0% 605MB/s ± 0% -2.67% (p=0.016 n=4+5) wuffs_jpeg_decode_552k_24bpp_444/gcc10 659MB/s ± 0% 647MB/s ± 0% -1.72% (p=0.008 n=5+5) wuffs_jpeg_decode_4002k_24bpp/gcc10 630MB/s ± 0% 613MB/s ± 0% -2.74% (p=0.008 n=5+5) --- internal/cgen/base/pixconv-submodule-ycck.c | 149 +++++-- internal/cgen/patch_pixconv.go | 16 - release/c/wuffs-unsupported-snapshot.c | 434 ++++++-------------- 3 files changed, 227 insertions(+), 372 deletions(-) diff --git a/internal/cgen/base/pixconv-submodule-ycck.c b/internal/cgen/base/pixconv-submodule-ycck.c index 05bec489..4f7e92d2 100644 --- a/internal/cgen/base/pixconv-submodule-ycck.c +++ b/internal/cgen/base/pixconv-submodule-ycck.c @@ -36,6 +36,78 @@ wuffs_base__u32__min_of_5(uint32_t a, // -------- +typedef void (*wuffs_base__pixel_swizzler__swizzle_ycc__convert_func)( + wuffs_base__pixel_buffer* dst, + uint32_t x, + uint32_t x_end, + uint32_t y, + const uint8_t* up0, + const uint8_t* up1, + const uint8_t* up2); + +static void // +wuffs_base__pixel_swizzler__swizzle_ycc__convert_general( + wuffs_base__pixel_buffer* dst, + uint32_t x, + uint32_t x_end, + uint32_t y, + const uint8_t* up0, + const uint8_t* up1, + const uint8_t* up2) { + for (; x < x_end; x++) { + uint32_t color = // + wuffs_base__color_ycc__as__color_u32( // + *up0++, *up1++, *up2++); + wuffs_base__pixel_buffer__set_color_u32_at(dst, x, y, color); + } +} + +static void // +wuffs_base__pixel_swizzler__swizzle_ycc__convert_bgrx( + wuffs_base__pixel_buffer* dst, + uint32_t x, + uint32_t x_end, + uint32_t y, + const uint8_t* up0, + const uint8_t* up1, + const uint8_t* up2) { + size_t dst_stride = dst->private_impl.planes[0].stride; + uint8_t* dst_iter = dst->private_impl.planes[0].ptr + + (dst_stride * ((size_t)y)) + (4 * ((size_t)x)); + + for (; x < x_end; x++) { + uint32_t color = // + wuffs_base__color_ycc__as__color_u32( // + *up0++, *up1++, *up2++); + wuffs_base__poke_u32le__no_bounds_check(dst_iter, color); + dst_iter += 4; + } +} + +static void // +wuffs_base__pixel_swizzler__swizzle_ycc__convert_rgbx( + wuffs_base__pixel_buffer* dst, + uint32_t x, + uint32_t x_end, + uint32_t y, + const uint8_t* up0, + const uint8_t* up1, + const uint8_t* up2) { + size_t dst_stride = dst->private_impl.planes[0].stride; + uint8_t* dst_iter = dst->private_impl.planes[0].ptr + + (dst_stride * ((size_t)y)) + (4 * ((size_t)x)); + + for (; x < x_end; x++) { + uint32_t color = // + wuffs_base__color_ycc__as__color_u32_abgr( // + *up0++, *up1++, *up2++); + wuffs_base__poke_u32le__no_bounds_check(dst_iter, color); + dst_iter += 4; + } +} + +// -------- + // wuffs_base__pixel_swizzler__swizzle_ycc__upsample_func upsamples to a // destination slice at least 480 (YCCK) or 672 (YCC) bytes long and whose // src_len (multiplied by 1, 2, 3 or 4) is positive but no more than that. This @@ -352,7 +424,8 @@ wuffs_base__pixel_swizzler__swizzle_ycc__general__triangle_filter_edge_row( uint8_t* scratch_buffer_2k_ptr, wuffs_base__pixel_swizzler__swizzle_ycc__upsample_func upfunc0, wuffs_base__pixel_swizzler__swizzle_ycc__upsample_func upfunc1, - wuffs_base__pixel_swizzler__swizzle_ycc__upsample_func upfunc2) { + wuffs_base__pixel_swizzler__swizzle_ycc__upsample_func upfunc2, + wuffs_base__pixel_swizzler__swizzle_ycc__convert_func convfunc) { const uint8_t* src0 = src_ptr0 + ((y / inv_v0) * (size_t)stride0); const uint8_t* src1 = src_ptr1 + ((y / inv_v1) * (size_t)stride1); const uint8_t* src2 = src_ptr2 + ((y / inv_v2) * (size_t)stride2); @@ -405,12 +478,8 @@ wuffs_base__pixel_swizzler__swizzle_ycc__general__triangle_filter_edge_row( first_column, // (total_src_len2 >= half_width_for_2to1)); - for (; x < end; x++) { - uint32_t color = // - wuffs_base__color_ycc__as__color_u32( // - *up0++, *up1++, *up2++); - wuffs_base__pixel_buffer__set_color_u32_at(dst, x, y, color); - } + (*convfunc)(dst, x, end, y, up0, up1, up2); + x = end; } } @@ -433,7 +502,8 @@ wuffs_base__pixel_swizzler__swizzle_ycc__general__triangle_filter( uint32_t inv_v2, uint32_t half_width_for_2to1, uint32_t half_height_for_2to1, - uint8_t* scratch_buffer_2k_ptr) { + uint8_t* scratch_buffer_2k_ptr, + wuffs_base__pixel_swizzler__swizzle_ycc__convert_func convfunc) { wuffs_base__pixel_swizzler__swizzle_ycc__upsample_func upfunc0 = wuffs_base__pixel_swizzler__swizzle_ycc__upsample_funcs [(inv_h0 - 1u) & 3u][(inv_v0 - 1u) & 3u]; @@ -455,7 +525,7 @@ wuffs_base__pixel_swizzler__swizzle_ycc__general__triangle_filter( half_width_for_2to1, // h1v2_bias, // scratch_buffer_2k_ptr, // - upfunc0, upfunc1, upfunc2); + upfunc0, upfunc1, upfunc2, convfunc); h1v2_bias = 2u; // Middle rows. @@ -524,15 +594,8 @@ wuffs_base__pixel_swizzler__swizzle_ycc__general__triangle_filter( first_column, // (total_src_len2 >= half_width_for_2to1)); - // ¡ dst_iter = etc - - for (; x < end; x++) { - uint32_t color = // - wuffs_base__color_ycc__as__color_u32( // - *up0++, *up1++, *up2++); - wuffs_base__pixel_buffer__set_color_u32_at(dst, x, y, color); - // ¡ dst_iter += 4 - } + (*convfunc)(dst, x, end, y, up0, up1, up2); + x = end; } h1v2_bias ^= 3u; @@ -549,7 +612,7 @@ wuffs_base__pixel_swizzler__swizzle_ycc__general__triangle_filter( half_width_for_2to1, // h1v2_bias, // scratch_buffer_2k_ptr, // - upfunc0, upfunc1, upfunc2); + upfunc0, upfunc1, upfunc2, convfunc); } } @@ -572,7 +635,8 @@ wuffs_base__pixel_swizzler__swizzle_ycc__general__box_filter( uint32_t inv_v2, uint32_t half_width_for_2to1, uint32_t half_height_for_2to1, - uint8_t* scratch_buffer_2k_ptr) { + uint8_t* scratch_buffer_2k_ptr, + wuffs_base__pixel_swizzler__swizzle_ycc__convert_func convfunc) { // Convert an inv_h or inv_v value from {1, 2, 3, 4} to {12, 6, 4, 3}. uint32_t h0_out_of_12 = 12u / inv_h0; uint32_t h1_out_of_12 = 12u / inv_h1; @@ -590,6 +654,7 @@ wuffs_base__pixel_swizzler__swizzle_ycc__general__box_filter( const uint8_t* src_iter1 = src_ptr1; const uint8_t* src_iter2 = src_ptr2; + // TODO: call convfunc instead. // ¡ dst_iter = etc uint32_t ix0 = 0u; @@ -671,13 +736,15 @@ wuffs_base__pixel_swizzler__swizzle_ycc__bgrx__hv11( uint32_t inv_v2, uint32_t half_width_for_2to1, uint32_t half_height_for_2to1, - uint8_t* scratch_buffer_2k_ptr) { + uint8_t* scratch_buffer_2k_ptr, + wuffs_base__pixel_swizzler__swizzle_ycc__convert_func convfunc) { uint32_t y = 0u; for (; y < height; y++) { const uint8_t* src_iter0 = src_ptr0; const uint8_t* src_iter1 = src_ptr1; const uint8_t* src_iter2 = src_ptr2; + // TODO: call convfunc instead. size_t dst_stride = dst->private_impl.planes[0].stride; uint8_t* dst_iter = dst->private_impl.planes[0].ptr + (dst_stride * ((size_t)y)); @@ -877,6 +944,24 @@ wuffs_base__pixel_swizzler__swizzle_ycck( return wuffs_base__make_status(NULL); } + wuffs_base__pixel_swizzler__swizzle_ycc__convert_func convfunc = NULL; + + switch (dst->pixcfg.private_impl.pixfmt.repr) { + case WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL: + case WUFFS_BASE__PIXEL_FORMAT__BGRA_PREMUL: + case WUFFS_BASE__PIXEL_FORMAT__BGRX: + convfunc = &wuffs_base__pixel_swizzler__swizzle_ycc__convert_bgrx; + break; + case WUFFS_BASE__PIXEL_FORMAT__RGBA_NONPREMUL: + case WUFFS_BASE__PIXEL_FORMAT__RGBA_PREMUL: + case WUFFS_BASE__PIXEL_FORMAT__RGBX: + convfunc = &wuffs_base__pixel_swizzler__swizzle_ycc__convert_rgbx; + break; + default: + convfunc = &wuffs_base__pixel_swizzler__swizzle_ycc__convert_general; + break; + } + void (*func)(wuffs_base__pixel_buffer * dst, // uint32_t width, // uint32_t height, // @@ -894,29 +979,15 @@ wuffs_base__pixel_swizzler__swizzle_ycck( uint32_t inv_v2, // uint32_t half_width_for_2to1, // uint32_t half_height_for_2to1, // - uint8_t* scratch_buffer_2k_ptr) = + uint8_t* scratch_buffer_2k_ptr, // + wuffs_base__pixel_swizzler__swizzle_ycc__convert_func convfunc) = &wuffs_base__pixel_swizzler__swizzle_ycc__general__box_filter; if (triangle_filter_for_2to1 && (wuffs_base__pixel_swizzler__has_triangle_upsampler(inv_h0, inv_v0) || wuffs_base__pixel_swizzler__has_triangle_upsampler(inv_h1, inv_v1) || wuffs_base__pixel_swizzler__has_triangle_upsampler(inv_h2, inv_v2))) { - switch (dst->pixcfg.private_impl.pixfmt.repr) { - case WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL: - case WUFFS_BASE__PIXEL_FORMAT__BGRA_PREMUL: - case WUFFS_BASE__PIXEL_FORMAT__BGRX: - func = &wuffs_base__pixel_swizzler__swizzle_ycc__bgrx__triangle_filter; - break; - case WUFFS_BASE__PIXEL_FORMAT__RGBA_NONPREMUL: - case WUFFS_BASE__PIXEL_FORMAT__RGBA_PREMUL: - case WUFFS_BASE__PIXEL_FORMAT__RGBX: - func = &wuffs_base__pixel_swizzler__swizzle_ycc__rgbx__triangle_filter; - break; - default: - func = - &wuffs_base__pixel_swizzler__swizzle_ycc__general__triangle_filter; - break; - } + func = &wuffs_base__pixel_swizzler__swizzle_ycc__general__triangle_filter; } else { switch (dst->pixcfg.private_impl.pixfmt.repr) { @@ -947,7 +1018,7 @@ wuffs_base__pixel_swizzler__swizzle_ycck( inv_h0, inv_h1, inv_h2, // inv_v0, inv_v1, inv_v2, // half_width_for_2to1, half_height_for_2to1, // - scratch_buffer_2k.ptr); + scratch_buffer_2k.ptr, convfunc); return wuffs_base__make_status(NULL); } diff --git a/internal/cgen/patch_pixconv.go b/internal/cgen/patch_pixconv.go index 6a08d7a8..0cf22312 100644 --- a/internal/cgen/patch_pixconv.go +++ b/internal/cgen/patch_pixconv.go @@ -37,10 +37,6 @@ func insertBasePixConvSubmoduleYcckC(buf *buffer) error { "size_t dst_stride = dst->private_impl.planes[0].stride;\n" + "uint8_t* dst_iter =\n" + " dst->private_impl.planes[0].ptr + (dst_stride * ((size_t)y));\n" - const dstIterEtcWithX = "" + - "size_t dst_stride = dst->private_impl.planes[0].stride;\n" + - "uint8_t* dst_iter =\n" + - " dst->private_impl.planes[0].ptr + (dst_stride * ((size_t)y)) + (4 * ((size_t)x));\n" const dstIterPlusEq4 = "" + "dst_iter += 4;\n" const setColorU32AtOld = "" + @@ -62,18 +58,6 @@ func insertBasePixConvSubmoduleYcckC(buf *buffer) error { map[string]string{}, }, { - []string{ - "wuffs_base__pixel_swizzler__swizzle_ycc__general__triangle_filter(\n", - "wuffs_base__pixel_swizzler__swizzle_ycc__bgrx__triangle_filter(\n", - "wuffs_base__pixel_swizzler__swizzle_ycc__rgbx__triangle_filter(\n", - }, - map[string]string{ - "// ¡ dst_iter = etc\n": dstIterEtcWithX, - "// ¡ dst_iter += 4\n": dstIterPlusEq4, - setColorU32AtOld: setColorU32AtNew, - }, - }, { - []string{ "wuffs_base__pixel_swizzler__swizzle_ycc__general__box_filter(\n", "wuffs_base__pixel_swizzler__swizzle_ycc__bgrx__box_filter(\n", diff --git a/release/c/wuffs-unsupported-snapshot.c b/release/c/wuffs-unsupported-snapshot.c index 26233a38..2dc5d116 100644 --- a/release/c/wuffs-unsupported-snapshot.c +++ b/release/c/wuffs-unsupported-snapshot.c @@ -23537,6 +23537,78 @@ wuffs_base__u32__min_of_5(uint32_t a, // -------- +typedef void (*wuffs_base__pixel_swizzler__swizzle_ycc__convert_func)( + wuffs_base__pixel_buffer* dst, + uint32_t x, + uint32_t x_end, + uint32_t y, + const uint8_t* up0, + const uint8_t* up1, + const uint8_t* up2); + +static void // +wuffs_base__pixel_swizzler__swizzle_ycc__convert_general( + wuffs_base__pixel_buffer* dst, + uint32_t x, + uint32_t x_end, + uint32_t y, + const uint8_t* up0, + const uint8_t* up1, + const uint8_t* up2) { + for (; x < x_end; x++) { + uint32_t color = // + wuffs_base__color_ycc__as__color_u32( // + *up0++, *up1++, *up2++); + wuffs_base__pixel_buffer__set_color_u32_at(dst, x, y, color); + } +} + +static void // +wuffs_base__pixel_swizzler__swizzle_ycc__convert_bgrx( + wuffs_base__pixel_buffer* dst, + uint32_t x, + uint32_t x_end, + uint32_t y, + const uint8_t* up0, + const uint8_t* up1, + const uint8_t* up2) { + size_t dst_stride = dst->private_impl.planes[0].stride; + uint8_t* dst_iter = dst->private_impl.planes[0].ptr + + (dst_stride * ((size_t)y)) + (4 * ((size_t)x)); + + for (; x < x_end; x++) { + uint32_t color = // + wuffs_base__color_ycc__as__color_u32( // + *up0++, *up1++, *up2++); + wuffs_base__poke_u32le__no_bounds_check(dst_iter, color); + dst_iter += 4; + } +} + +static void // +wuffs_base__pixel_swizzler__swizzle_ycc__convert_rgbx( + wuffs_base__pixel_buffer* dst, + uint32_t x, + uint32_t x_end, + uint32_t y, + const uint8_t* up0, + const uint8_t* up1, + const uint8_t* up2) { + size_t dst_stride = dst->private_impl.planes[0].stride; + uint8_t* dst_iter = dst->private_impl.planes[0].ptr + + (dst_stride * ((size_t)y)) + (4 * ((size_t)x)); + + for (; x < x_end; x++) { + uint32_t color = // + wuffs_base__color_ycc__as__color_u32_abgr( // + *up0++, *up1++, *up2++); + wuffs_base__poke_u32le__no_bounds_check(dst_iter, color); + dst_iter += 4; + } +} + +// -------- + // wuffs_base__pixel_swizzler__swizzle_ycc__upsample_func upsamples to a // destination slice at least 480 (YCCK) or 672 (YCC) bytes long and whose // src_len (multiplied by 1, 2, 3 or 4) is positive but no more than that. This @@ -23853,7 +23925,8 @@ wuffs_base__pixel_swizzler__swizzle_ycc__general__triangle_filter_edge_row( uint8_t* scratch_buffer_2k_ptr, wuffs_base__pixel_swizzler__swizzle_ycc__upsample_func upfunc0, wuffs_base__pixel_swizzler__swizzle_ycc__upsample_func upfunc1, - wuffs_base__pixel_swizzler__swizzle_ycc__upsample_func upfunc2) { + wuffs_base__pixel_swizzler__swizzle_ycc__upsample_func upfunc2, + wuffs_base__pixel_swizzler__swizzle_ycc__convert_func convfunc) { const uint8_t* src0 = src_ptr0 + ((y / inv_v0) * (size_t)stride0); const uint8_t* src1 = src_ptr1 + ((y / inv_v1) * (size_t)stride1); const uint8_t* src2 = src_ptr2 + ((y / inv_v2) * (size_t)stride2); @@ -23906,12 +23979,8 @@ wuffs_base__pixel_swizzler__swizzle_ycc__general__triangle_filter_edge_row( first_column, // (total_src_len2 >= half_width_for_2to1)); - for (; x < end; x++) { - uint32_t color = // - wuffs_base__color_ycc__as__color_u32( // - *up0++, *up1++, *up2++); - wuffs_base__pixel_buffer__set_color_u32_at(dst, x, y, color); - } + (*convfunc)(dst, x, end, y, up0, up1, up2); + x = end; } } @@ -23934,7 +24003,8 @@ wuffs_base__pixel_swizzler__swizzle_ycc__general__triangle_filter( uint32_t inv_v2, uint32_t half_width_for_2to1, uint32_t half_height_for_2to1, - uint8_t* scratch_buffer_2k_ptr) { + uint8_t* scratch_buffer_2k_ptr, + wuffs_base__pixel_swizzler__swizzle_ycc__convert_func convfunc) { wuffs_base__pixel_swizzler__swizzle_ycc__upsample_func upfunc0 = wuffs_base__pixel_swizzler__swizzle_ycc__upsample_funcs [(inv_h0 - 1u) & 3u][(inv_v0 - 1u) & 3u]; @@ -23956,7 +24026,7 @@ wuffs_base__pixel_swizzler__swizzle_ycc__general__triangle_filter( half_width_for_2to1, // h1v2_bias, // scratch_buffer_2k_ptr, // - upfunc0, upfunc1, upfunc2); + upfunc0, upfunc1, upfunc2, convfunc); h1v2_bias = 2u; // Middle rows. @@ -24025,12 +24095,8 @@ wuffs_base__pixel_swizzler__swizzle_ycc__general__triangle_filter( first_column, // (total_src_len2 >= half_width_for_2to1)); - for (; x < end; x++) { - uint32_t color = // - wuffs_base__color_ycc__as__color_u32( // - *up0++, *up1++, *up2++); - wuffs_base__pixel_buffer__set_color_u32_at(dst, x, y, color); - } + (*convfunc)(dst, x, end, y, up0, up1, up2); + x = end; } h1v2_bias ^= 3u; @@ -24047,7 +24113,7 @@ wuffs_base__pixel_swizzler__swizzle_ycc__general__triangle_filter( half_width_for_2to1, // h1v2_bias, // scratch_buffer_2k_ptr, // - upfunc0, upfunc1, upfunc2); + upfunc0, upfunc1, upfunc2, convfunc); } } @@ -24070,7 +24136,8 @@ wuffs_base__pixel_swizzler__swizzle_ycc__general__box_filter( uint32_t inv_v2, uint32_t half_width_for_2to1, uint32_t half_height_for_2to1, - uint8_t* scratch_buffer_2k_ptr) { + uint8_t* scratch_buffer_2k_ptr, + wuffs_base__pixel_swizzler__swizzle_ycc__convert_func convfunc) { // Convert an inv_h or inv_v value from {1, 2, 3, 4} to {12, 6, 4, 3}. uint32_t h0_out_of_12 = 12u / inv_h0; uint32_t h1_out_of_12 = 12u / inv_h1; @@ -24088,6 +24155,8 @@ wuffs_base__pixel_swizzler__swizzle_ycc__general__box_filter( const uint8_t* src_iter1 = src_ptr1; const uint8_t* src_iter2 = src_ptr2; + // TODO: call convfunc instead. + uint32_t ix0 = 0u; uint32_t ix1 = 0u; uint32_t ix2 = 0u; @@ -24166,13 +24235,15 @@ wuffs_base__pixel_swizzler__swizzle_ycc__bgrx__hv11( uint32_t inv_v2, uint32_t half_width_for_2to1, uint32_t half_height_for_2to1, - uint8_t* scratch_buffer_2k_ptr) { + uint8_t* scratch_buffer_2k_ptr, + wuffs_base__pixel_swizzler__swizzle_ycc__convert_func convfunc) { uint32_t y = 0u; for (; y < height; y++) { const uint8_t* src_iter0 = src_ptr0; const uint8_t* src_iter1 = src_ptr1; const uint8_t* src_iter2 = src_ptr2; + // TODO: call convfunc instead. size_t dst_stride = dst->private_impl.planes[0].stride; uint8_t* dst_iter = dst->private_impl.planes[0].ptr + (dst_stride * ((size_t)y)); @@ -24241,7 +24312,8 @@ wuffs_base__pixel_swizzler__swizzle_ycc__rgbx__hv11( uint32_t inv_v2, uint32_t half_width_for_2to1, uint32_t half_height_for_2to1, - uint8_t* scratch_buffer_2k_ptr) { + uint8_t* scratch_buffer_2k_ptr, + wuffs_base__pixel_swizzler__swizzle_ycc__convert_func convfunc) { uint32_t y = 0u; for (; y < height; y++) { const uint8_t* src_iter0 = src_ptr0; @@ -24296,284 +24368,6 @@ wuffs_base__pixel_swizzler__swizzle_ycc__rgbx__hv11( } } -// Generated by internal/cgen/patch_pixconv.go -static void // -wuffs_base__pixel_swizzler__swizzle_ycc__bgrx__triangle_filter( - wuffs_base__pixel_buffer* dst, - uint32_t width, - uint32_t height, - const uint8_t* src_ptr0, - const uint8_t* src_ptr1, - const uint8_t* src_ptr2, - uint32_t stride0, - uint32_t stride1, - uint32_t stride2, - uint32_t inv_h0, - uint32_t inv_h1, - uint32_t inv_h2, - uint32_t inv_v0, - uint32_t inv_v1, - uint32_t inv_v2, - uint32_t half_width_for_2to1, - uint32_t half_height_for_2to1, - uint8_t* scratch_buffer_2k_ptr) { - wuffs_base__pixel_swizzler__swizzle_ycc__upsample_func upfunc0 = - wuffs_base__pixel_swizzler__swizzle_ycc__upsample_funcs - [(inv_h0 - 1u) & 3u][(inv_v0 - 1u) & 3u]; - wuffs_base__pixel_swizzler__swizzle_ycc__upsample_func upfunc1 = - wuffs_base__pixel_swizzler__swizzle_ycc__upsample_funcs - [(inv_h1 - 1u) & 3u][(inv_v1 - 1u) & 3u]; - wuffs_base__pixel_swizzler__swizzle_ycc__upsample_func upfunc2 = - wuffs_base__pixel_swizzler__swizzle_ycc__upsample_funcs - [(inv_h2 - 1u) & 3u][(inv_v2 - 1u) & 3u]; - - uint32_t h1v2_bias = 1u; - wuffs_base__pixel_swizzler__swizzle_ycc__general__triangle_filter_edge_row( - dst, width, 0u, // - src_ptr0, src_ptr1, src_ptr2, // - stride0, stride1, stride2, // - inv_h0, inv_h1, inv_h2, // - inv_v0, inv_v1, inv_v2, // - half_width_for_2to1, // - h1v2_bias, // - scratch_buffer_2k_ptr, // - upfunc0, upfunc1, upfunc2); - h1v2_bias = 2u; - - bool last_row = height == 2u * half_height_for_2to1; - uint32_t y_max_excl = last_row ? (height - 1u) : height; - uint32_t y; - for (y = 1u; y < y_max_excl; y++) { - const uint8_t* src0_major = src_ptr0 + ((y / inv_v0) * (size_t)stride0); - const uint8_t* src0_minor = - (inv_v0 != 2u) - ? src0_major - : ((y & 1u) ? (src0_major + stride0) : (src0_major - stride0)); - const uint8_t* src1_major = src_ptr1 + ((y / inv_v1) * (size_t)stride1); - const uint8_t* src1_minor = - (inv_v1 != 2u) - ? src1_major - : ((y & 1u) ? (src1_major + stride1) : (src1_major - stride1)); - const uint8_t* src2_major = src_ptr2 + ((y / inv_v2) * (size_t)stride2); - const uint8_t* src2_minor = - (inv_v2 != 2u) - ? src2_major - : ((y & 1u) ? (src2_major + stride2) : (src2_major - stride2)); - uint32_t total_src_len0 = 0u; - uint32_t total_src_len1 = 0u; - uint32_t total_src_len2 = 0u; - - uint32_t x = 0u; - while (x < width) { - bool first_column = x == 0u; - uint32_t end = x + 672u; - if (end > width) { - end = width; - } - - uint32_t src_len0 = ((end - x) + inv_h0 - 1u) / inv_h0; - uint32_t src_len1 = ((end - x) + inv_h1 - 1u) / inv_h1; - uint32_t src_len2 = ((end - x) + inv_h2 - 1u) / inv_h2; - total_src_len0 += src_len0; - total_src_len1 += src_len1; - total_src_len2 += src_len2; - - const uint8_t* up0 = (*upfunc0)( // - scratch_buffer_2k_ptr + (0u * 672u), // - src0_major + (x / inv_h0), // - src0_minor + (x / inv_h0), // - src_len0, // - h1v2_bias, // - first_column, // - (total_src_len0 >= half_width_for_2to1)); - - const uint8_t* up1 = (*upfunc1)( // - scratch_buffer_2k_ptr + (1u * 672u), // - src1_major + (x / inv_h1), // - src1_minor + (x / inv_h1), // - src_len1, // - h1v2_bias, // - first_column, // - (total_src_len1 >= half_width_for_2to1)); - - const uint8_t* up2 = (*upfunc2)( // - scratch_buffer_2k_ptr + (2u * 672u), // - src2_major + (x / inv_h2), // - src2_minor + (x / inv_h2), // - src_len2, // - h1v2_bias, // - first_column, // - (total_src_len2 >= half_width_for_2to1)); - - size_t dst_stride = dst->private_impl.planes[0].stride; - uint8_t* dst_iter = - dst->private_impl.planes[0].ptr + (dst_stride * ((size_t)y)) + (4 * ((size_t)x)); - - for (; x < end; x++) { - uint32_t color = // - wuffs_base__color_ycc__as__color_u32( // - *up0++, *up1++, *up2++); - wuffs_base__poke_u32le__no_bounds_check(dst_iter, color); - dst_iter += 4; - } - } - - h1v2_bias ^= 3u; - } - - if (y_max_excl != height) { - wuffs_base__pixel_swizzler__swizzle_ycc__general__triangle_filter_edge_row( - dst, width, height - 1u, // - src_ptr0, src_ptr1, src_ptr2, // - stride0, stride1, stride2, // - inv_h0, inv_h1, inv_h2, // - inv_v0, inv_v1, inv_v2, // - half_width_for_2to1, // - h1v2_bias, // - scratch_buffer_2k_ptr, // - upfunc0, upfunc1, upfunc2); - } -} - -// Generated by internal/cgen/patch_pixconv.go -static void // -wuffs_base__pixel_swizzler__swizzle_ycc__rgbx__triangle_filter( - wuffs_base__pixel_buffer* dst, - uint32_t width, - uint32_t height, - const uint8_t* src_ptr0, - const uint8_t* src_ptr1, - const uint8_t* src_ptr2, - uint32_t stride0, - uint32_t stride1, - uint32_t stride2, - uint32_t inv_h0, - uint32_t inv_h1, - uint32_t inv_h2, - uint32_t inv_v0, - uint32_t inv_v1, - uint32_t inv_v2, - uint32_t half_width_for_2to1, - uint32_t half_height_for_2to1, - uint8_t* scratch_buffer_2k_ptr) { - wuffs_base__pixel_swizzler__swizzle_ycc__upsample_func upfunc0 = - wuffs_base__pixel_swizzler__swizzle_ycc__upsample_funcs - [(inv_h0 - 1u) & 3u][(inv_v0 - 1u) & 3u]; - wuffs_base__pixel_swizzler__swizzle_ycc__upsample_func upfunc1 = - wuffs_base__pixel_swizzler__swizzle_ycc__upsample_funcs - [(inv_h1 - 1u) & 3u][(inv_v1 - 1u) & 3u]; - wuffs_base__pixel_swizzler__swizzle_ycc__upsample_func upfunc2 = - wuffs_base__pixel_swizzler__swizzle_ycc__upsample_funcs - [(inv_h2 - 1u) & 3u][(inv_v2 - 1u) & 3u]; - - uint32_t h1v2_bias = 1u; - wuffs_base__pixel_swizzler__swizzle_ycc__general__triangle_filter_edge_row( - dst, width, 0u, // - src_ptr0, src_ptr1, src_ptr2, // - stride0, stride1, stride2, // - inv_h0, inv_h1, inv_h2, // - inv_v0, inv_v1, inv_v2, // - half_width_for_2to1, // - h1v2_bias, // - scratch_buffer_2k_ptr, // - upfunc0, upfunc1, upfunc2); - h1v2_bias = 2u; - - bool last_row = height == 2u * half_height_for_2to1; - uint32_t y_max_excl = last_row ? (height - 1u) : height; - uint32_t y; - for (y = 1u; y < y_max_excl; y++) { - const uint8_t* src0_major = src_ptr0 + ((y / inv_v0) * (size_t)stride0); - const uint8_t* src0_minor = - (inv_v0 != 2u) - ? src0_major - : ((y & 1u) ? (src0_major + stride0) : (src0_major - stride0)); - const uint8_t* src1_major = src_ptr1 + ((y / inv_v1) * (size_t)stride1); - const uint8_t* src1_minor = - (inv_v1 != 2u) - ? src1_major - : ((y & 1u) ? (src1_major + stride1) : (src1_major - stride1)); - const uint8_t* src2_major = src_ptr2 + ((y / inv_v2) * (size_t)stride2); - const uint8_t* src2_minor = - (inv_v2 != 2u) - ? src2_major - : ((y & 1u) ? (src2_major + stride2) : (src2_major - stride2)); - uint32_t total_src_len0 = 0u; - uint32_t total_src_len1 = 0u; - uint32_t total_src_len2 = 0u; - - uint32_t x = 0u; - while (x < width) { - bool first_column = x == 0u; - uint32_t end = x + 672u; - if (end > width) { - end = width; - } - - uint32_t src_len0 = ((end - x) + inv_h0 - 1u) / inv_h0; - uint32_t src_len1 = ((end - x) + inv_h1 - 1u) / inv_h1; - uint32_t src_len2 = ((end - x) + inv_h2 - 1u) / inv_h2; - total_src_len0 += src_len0; - total_src_len1 += src_len1; - total_src_len2 += src_len2; - - const uint8_t* up0 = (*upfunc0)( // - scratch_buffer_2k_ptr + (0u * 672u), // - src0_major + (x / inv_h0), // - src0_minor + (x / inv_h0), // - src_len0, // - h1v2_bias, // - first_column, // - (total_src_len0 >= half_width_for_2to1)); - - const uint8_t* up1 = (*upfunc1)( // - scratch_buffer_2k_ptr + (1u * 672u), // - src1_major + (x / inv_h1), // - src1_minor + (x / inv_h1), // - src_len1, // - h1v2_bias, // - first_column, // - (total_src_len1 >= half_width_for_2to1)); - - const uint8_t* up2 = (*upfunc2)( // - scratch_buffer_2k_ptr + (2u * 672u), // - src2_major + (x / inv_h2), // - src2_minor + (x / inv_h2), // - src_len2, // - h1v2_bias, // - first_column, // - (total_src_len2 >= half_width_for_2to1)); - - size_t dst_stride = dst->private_impl.planes[0].stride; - uint8_t* dst_iter = - dst->private_impl.planes[0].ptr + (dst_stride * ((size_t)y)) + (4 * ((size_t)x)); - - for (; x < end; x++) { - uint32_t color = // - wuffs_base__color_ycc__as__color_u32_abgr( - *up0++, *up1++, *up2++); - wuffs_base__poke_u32le__no_bounds_check(dst_iter, color); - dst_iter += 4; - } - } - - h1v2_bias ^= 3u; - } - - if (y_max_excl != height) { - wuffs_base__pixel_swizzler__swizzle_ycc__general__triangle_filter_edge_row( - dst, width, height - 1u, // - src_ptr0, src_ptr1, src_ptr2, // - stride0, stride1, stride2, // - inv_h0, inv_h1, inv_h2, // - inv_v0, inv_v1, inv_v2, // - half_width_for_2to1, // - h1v2_bias, // - scratch_buffer_2k_ptr, // - upfunc0, upfunc1, upfunc2); - } -} - // Generated by internal/cgen/patch_pixconv.go static void // wuffs_base__pixel_swizzler__swizzle_ycc__bgrx__box_filter( @@ -24594,7 +24388,8 @@ wuffs_base__pixel_swizzler__swizzle_ycc__bgrx__box_filter( uint32_t inv_v2, uint32_t half_width_for_2to1, uint32_t half_height_for_2to1, - uint8_t* scratch_buffer_2k_ptr) { + uint8_t* scratch_buffer_2k_ptr, + wuffs_base__pixel_swizzler__swizzle_ycc__convert_func convfunc) { uint32_t h0_out_of_12 = 12u / inv_h0; uint32_t h1_out_of_12 = 12u / inv_h1; uint32_t h2_out_of_12 = 12u / inv_h2; @@ -24689,7 +24484,8 @@ wuffs_base__pixel_swizzler__swizzle_ycc__rgbx__box_filter( uint32_t inv_v2, uint32_t half_width_for_2to1, uint32_t half_height_for_2to1, - uint8_t* scratch_buffer_2k_ptr) { + uint8_t* scratch_buffer_2k_ptr, + wuffs_base__pixel_swizzler__swizzle_ycc__convert_func convfunc) { uint32_t h0_out_of_12 = 12u / inv_h0; uint32_t h1_out_of_12 = 12u / inv_h1; uint32_t h2_out_of_12 = 12u / inv_h2; @@ -24913,6 +24709,24 @@ wuffs_base__pixel_swizzler__swizzle_ycck( return wuffs_base__make_status(NULL); } + wuffs_base__pixel_swizzler__swizzle_ycc__convert_func convfunc = NULL; + + switch (dst->pixcfg.private_impl.pixfmt.repr) { + case WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL: + case WUFFS_BASE__PIXEL_FORMAT__BGRA_PREMUL: + case WUFFS_BASE__PIXEL_FORMAT__BGRX: + convfunc = &wuffs_base__pixel_swizzler__swizzle_ycc__convert_bgrx; + break; + case WUFFS_BASE__PIXEL_FORMAT__RGBA_NONPREMUL: + case WUFFS_BASE__PIXEL_FORMAT__RGBA_PREMUL: + case WUFFS_BASE__PIXEL_FORMAT__RGBX: + convfunc = &wuffs_base__pixel_swizzler__swizzle_ycc__convert_rgbx; + break; + default: + convfunc = &wuffs_base__pixel_swizzler__swizzle_ycc__convert_general; + break; + } + void (*func)(wuffs_base__pixel_buffer * dst, // uint32_t width, // uint32_t height, // @@ -24930,29 +24744,15 @@ wuffs_base__pixel_swizzler__swizzle_ycck( uint32_t inv_v2, // uint32_t half_width_for_2to1, // uint32_t half_height_for_2to1, // - uint8_t* scratch_buffer_2k_ptr) = + uint8_t* scratch_buffer_2k_ptr, // + wuffs_base__pixel_swizzler__swizzle_ycc__convert_func convfunc) = &wuffs_base__pixel_swizzler__swizzle_ycc__general__box_filter; if (triangle_filter_for_2to1 && (wuffs_base__pixel_swizzler__has_triangle_upsampler(inv_h0, inv_v0) || wuffs_base__pixel_swizzler__has_triangle_upsampler(inv_h1, inv_v1) || wuffs_base__pixel_swizzler__has_triangle_upsampler(inv_h2, inv_v2))) { - switch (dst->pixcfg.private_impl.pixfmt.repr) { - case WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL: - case WUFFS_BASE__PIXEL_FORMAT__BGRA_PREMUL: - case WUFFS_BASE__PIXEL_FORMAT__BGRX: - func = &wuffs_base__pixel_swizzler__swizzle_ycc__bgrx__triangle_filter; - break; - case WUFFS_BASE__PIXEL_FORMAT__RGBA_NONPREMUL: - case WUFFS_BASE__PIXEL_FORMAT__RGBA_PREMUL: - case WUFFS_BASE__PIXEL_FORMAT__RGBX: - func = &wuffs_base__pixel_swizzler__swizzle_ycc__rgbx__triangle_filter; - break; - default: - func = - &wuffs_base__pixel_swizzler__swizzle_ycc__general__triangle_filter; - break; - } + func = &wuffs_base__pixel_swizzler__swizzle_ycc__general__triangle_filter; } else { switch (dst->pixcfg.private_impl.pixfmt.repr) { @@ -24983,7 +24783,7 @@ wuffs_base__pixel_swizzler__swizzle_ycck( inv_h0, inv_h1, inv_h2, // inv_v0, inv_v1, inv_v2, // half_width_for_2to1, half_height_for_2to1, // - scratch_buffer_2k.ptr); + scratch_buffer_2k.ptr, convfunc); return wuffs_base__make_status(NULL); }