pixconv: remove some obsolete swizzle_ycc code

This commit is contained in:
Nigel Tao committed 2023-07-30 17:49:19 +10:00
1 parent b3d0d7b855
commit e60966aa45
4 files changed
+5 -628

No files matched your search

-320
View File
@@ -24284,326 +24284,6 @@ wuffs_base__pixel_swizzler__swizzle_ycc__general__box_filter(
// --------
// Specialized forms of:
// - wuffs_base__pixel_swizzler__swizzle_ycc__general__triangle_filter
// - wuffs_base__pixel_swizzler__swizzle_ycc__general__box_filter
static void //
wuffs_base__pixel_swizzler__swizzle_ycc__bgrx__hv11(
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 (*upfuncs)[4][4],
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));
uint32_t x = 0u;
for (; (x + 4u) <= width; x += 4u) {
wuffs_base__poke_u32le__no_bounds_check( //
dst_iter + 0x00, //
wuffs_base__color_ycc__as__color_u32( //
src_iter0[0], src_iter1[0], src_iter2[0]));
wuffs_base__poke_u32le__no_bounds_check( //
dst_iter + 0x04, //
wuffs_base__color_ycc__as__color_u32( //
src_iter0[1], src_iter1[1], src_iter2[1]));
wuffs_base__poke_u32le__no_bounds_check( //
dst_iter + 0x08, //
wuffs_base__color_ycc__as__color_u32( //
src_iter0[2], src_iter1[2], src_iter2[2]));
wuffs_base__poke_u32le__no_bounds_check( //
dst_iter + 0x0C, //
wuffs_base__color_ycc__as__color_u32( //
src_iter0[3], src_iter1[3], src_iter2[3]));
dst_iter += 16;
src_iter0 += 4u;
src_iter1 += 4u;
src_iter2 += 4u;
}
for (; x < width; x++) {
wuffs_base__poke_u32le__no_bounds_check( //
dst_iter + 0x00, //
wuffs_base__color_ycc__as__color_u32( //
src_iter0[0], src_iter1[0], src_iter2[0]));
dst_iter += 4;
src_iter0++;
src_iter1++;
src_iter2++;
}
src_ptr0 += stride0;
src_ptr1 += stride1;
src_ptr2 += stride2;
}
}
// Generated by internal/cgen/patch_pixconv.go
static void //
wuffs_base__pixel_swizzler__swizzle_ycc__rgbx__hv11(
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 (*upfuncs)[4][4],
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;
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));
uint32_t x = 0u;
for (; (x + 4u) <= width; x += 4u) {
wuffs_base__poke_u32le__no_bounds_check( //
dst_iter + 0x00, //
wuffs_base__color_ycc__as__color_u32_abgr(
src_iter0[0], src_iter1[0], src_iter2[0]));
wuffs_base__poke_u32le__no_bounds_check( //
dst_iter + 0x04, //
wuffs_base__color_ycc__as__color_u32_abgr(
src_iter0[1], src_iter1[1], src_iter2[1]));
wuffs_base__poke_u32le__no_bounds_check( //
dst_iter + 0x08, //
wuffs_base__color_ycc__as__color_u32_abgr(
src_iter0[2], src_iter1[2], src_iter2[2]));
wuffs_base__poke_u32le__no_bounds_check( //
dst_iter + 0x0C, //
wuffs_base__color_ycc__as__color_u32_abgr(
src_iter0[3], src_iter1[3], src_iter2[3]));
dst_iter += 16;
src_iter0 += 4u;
src_iter1 += 4u;
src_iter2 += 4u;
}
for (; x < width; x++) {
wuffs_base__poke_u32le__no_bounds_check( //
dst_iter + 0x00, //
wuffs_base__color_ycc__as__color_u32_abgr(
src_iter0[0], src_iter1[0], src_iter2[0]));
dst_iter += 4;
src_iter0++;
src_iter1++;
src_iter2++;
}
src_ptr0 += stride0;
src_ptr1 += stride1;
src_ptr2 += stride2;
}
}
// Generated by internal/cgen/patch_pixconv.go
static void //
wuffs_base__pixel_swizzler__swizzle_ycc__bgrx__box_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 (*upfuncs)[4][4],
wuffs_base__pixel_swizzler__swizzle_ycc__convert_func convfunc) {
wuffs_base__pixel_swizzler__swizzle_ycc__upsample_func upfunc0 =
(*upfuncs)[(inv_h0 - 1u) & 3u][(inv_v0 - 1u) & 3u];
wuffs_base__pixel_swizzler__swizzle_ycc__upsample_func upfunc1 =
(*upfuncs)[(inv_h1 - 1u) & 3u][(inv_v1 - 1u) & 3u];
wuffs_base__pixel_swizzler__swizzle_ycc__upsample_func upfunc2 =
(*upfuncs)[(inv_h2 - 1u) & 3u][(inv_v2 - 1u) & 3u];
uint32_t y;
for (y = 0u; y < height; y++) {
const uint8_t* src0_major = src_ptr0 + ((y / inv_v0) * (size_t)stride0);
const uint8_t* src1_major = src_ptr1 + ((y / inv_v1) * (size_t)stride1);
const uint8_t* src2_major = src_ptr2 + ((y / inv_v2) * (size_t)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) {
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_major + (x / inv_h0), //
src_len0, //
0u, false, false);
const uint8_t* up1 = (*upfunc1)( //
scratch_buffer_2k_ptr + (1u * 672u), //
src1_major + (x / inv_h1), //
src1_major + (x / inv_h1), //
src_len1, //
0u, false, false);
const uint8_t* up2 = (*upfunc2)( //
scratch_buffer_2k_ptr + (2u * 672u), //
src2_major + (x / inv_h2), //
src2_major + (x / inv_h2), //
src_len2, //
0u, false, false);
(*convfunc)(dst, x, end, y, up0, up1, up2);
x = end;
}
}
}
// Generated by internal/cgen/patch_pixconv.go
static void //
wuffs_base__pixel_swizzler__swizzle_ycc__rgbx__box_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 (*upfuncs)[4][4],
wuffs_base__pixel_swizzler__swizzle_ycc__convert_func convfunc) {
wuffs_base__pixel_swizzler__swizzle_ycc__upsample_func upfunc0 =
(*upfuncs)[(inv_h0 - 1u) & 3u][(inv_v0 - 1u) & 3u];
wuffs_base__pixel_swizzler__swizzle_ycc__upsample_func upfunc1 =
(*upfuncs)[(inv_h1 - 1u) & 3u][(inv_v1 - 1u) & 3u];
wuffs_base__pixel_swizzler__swizzle_ycc__upsample_func upfunc2 =
(*upfuncs)[(inv_h2 - 1u) & 3u][(inv_v2 - 1u) & 3u];
uint32_t y;
for (y = 0u; y < height; y++) {
const uint8_t* src0_major = src_ptr0 + ((y / inv_v0) * (size_t)stride0);
const uint8_t* src1_major = src_ptr1 + ((y / inv_v1) * (size_t)stride1);
const uint8_t* src2_major = src_ptr2 + ((y / inv_v2) * (size_t)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) {
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_major + (x / inv_h0), //
src_len0, //
0u, false, false);
const uint8_t* up1 = (*upfunc1)( //
scratch_buffer_2k_ptr + (1u * 672u), //
src1_major + (x / inv_h1), //
src1_major + (x / inv_h1), //
src_len1, //
0u, false, false);
const uint8_t* up2 = (*upfunc2)( //
scratch_buffer_2k_ptr + (2u * 672u), //
src2_major + (x / inv_h2), //
src2_major + (x / inv_h2), //
src_len2, //
0u, false, false);
(*convfunc)(dst, x, end, y, up0, up1, up2);
x = end;
}
}
}
// --------
// wuffs_base__pixel_swizzler__flattened_length is like
// wuffs_base__table__flattened_length but returns uint64_t (not size_t) and
// also accounts for subsampling.