From fd5ab5f7b340a9e05b7ea8bbf21678c435da0554 Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Mon, 31 Jul 2023 16:05:10 +1000 Subject: [PATCH] pixconv: tweak "if (triangle_filter_for_2to1)" --- internal/cgen/base/pixconv-submodule-ycck.c | 14 ++++++-------- release/c/wuffs-unsupported-snapshot.c | 14 ++++++-------- 2 files changed, 12 insertions(+), 16 deletions(-) diff --git a/internal/cgen/base/pixconv-submodule-ycck.c b/internal/cgen/base/pixconv-submodule-ycck.c index 46d9bfbf..d22f5f1d 100644 --- a/internal/cgen/base/pixconv-submodule-ycck.c +++ b/internal/cgen/base/pixconv-submodule-ycck.c @@ -936,7 +936,12 @@ wuffs_base__pixel_swizzler__swizzle_ycck( memcpy(&upfuncs, &wuffs_base__pixel_swizzler__swizzle_ycc__upsample_funcs, sizeof upfuncs); - if (triangle_filter_for_2to1) { + 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))) { + func = &wuffs_base__pixel_swizzler__swizzle_ycc__general__triangle_filter; + upfuncs[0][1] = wuffs_base__pixel_swizzler__swizzle_ycc__upsample_inv_h1v2_triangle; upfuncs[1][0] = @@ -966,13 +971,6 @@ wuffs_base__pixel_swizzler__swizzle_ycck( #endif } - 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))) { - func = &wuffs_base__pixel_swizzler__swizzle_ycc__general__triangle_filter; - } - (*func)(dst, width, height, // src0.ptr, src1.ptr, src2.ptr, // stride0, stride1, stride2, // diff --git a/release/c/wuffs-unsupported-snapshot.c b/release/c/wuffs-unsupported-snapshot.c index ee2b245d..0e00bcab 100644 --- a/release/c/wuffs-unsupported-snapshot.c +++ b/release/c/wuffs-unsupported-snapshot.c @@ -24488,7 +24488,12 @@ wuffs_base__pixel_swizzler__swizzle_ycck( memcpy(&upfuncs, &wuffs_base__pixel_swizzler__swizzle_ycc__upsample_funcs, sizeof upfuncs); - if (triangle_filter_for_2to1) { + 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))) { + func = &wuffs_base__pixel_swizzler__swizzle_ycc__general__triangle_filter; + upfuncs[0][1] = wuffs_base__pixel_swizzler__swizzle_ycc__upsample_inv_h1v2_triangle; upfuncs[1][0] = @@ -24518,13 +24523,6 @@ wuffs_base__pixel_swizzler__swizzle_ycck( #endif } - 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))) { - func = &wuffs_base__pixel_swizzler__swizzle_ycc__general__triangle_filter; - } - (*func)(dst, width, height, // src0.ptr, src1.ptr, src2.ptr, // stride0, stride1, stride2, //