pixconv: allow swizzle from PIXEL_FORMAT__Y_16LE

Binary size, before:
142648 gen/lib/c/clang-dynamic/wuffs-base-pixconv.lo
142648 gen/lib/c/clang-static/wuffs-base-pixconv.o
243368 gen/lib/c/gcc-dynamic/wuffs-base-pixconv.lo
243240 gen/lib/c/gcc-static/wuffs-base-pixconv.o

After:
145472 gen/lib/c/clang-dynamic/wuffs-base-pixconv.lo
145472 gen/lib/c/clang-static/wuffs-base-pixconv.o
247720 gen/lib/c/gcc-dynamic/wuffs-base-pixconv.lo
247688 gen/lib/c/gcc-static/wuffs-base-pixconv.o
This commit is contained in:
Nigel Tao committed 2025-06-10 11:33:08 +10:00
1 parent 22c3b002ce
commit 5ec14737f3
4 files changed
+381

No files matched your search

+1
View File
@@ -72,6 +72,7 @@ It should print "PASS", amongst other information, and exit(0).
const uint32_t pixfmts[] = {
WUFFS_BASE__PIXEL_FORMAT__Y,
WUFFS_BASE__PIXEL_FORMAT__Y_16BE,
WUFFS_BASE__PIXEL_FORMAT__Y_16LE,
WUFFS_BASE__PIXEL_FORMAT__YA_NONPREMUL,
WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_NONPREMUL,
WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_BINARY,
@@ -1747,6 +1747,36 @@ wuffs_private_impl__swizzle_bgr_565__y_16be(uint8_t* dst_ptr,
return len;
}
static uint64_t //
wuffs_private_impl__swizzle_bgr_565__y_16le(uint8_t* dst_ptr,
size_t dst_len,
uint8_t* dst_palette_ptr,
size_t dst_palette_len,
const uint8_t* src_ptr,
size_t src_len) {
size_t dst_len2 = dst_len / 2;
size_t src_len2 = src_len / 2;
size_t len = (dst_len2 < src_len2) ? dst_len2 : src_len2;
uint8_t* d = dst_ptr;
const uint8_t* s = src_ptr;
size_t n = len;
// TODO: unroll.
while (n >= 1) {
uint32_t y5 = (uint32_t)(s[1] >> 3);
uint32_t y6 = (uint32_t)(s[1] >> 2);
uint32_t rgb_565 = (y5 << 11) | (y6 << 5) | (y5 << 0);
wuffs_base__poke_u16le__no_bounds_check(d + (0 * 2), (uint16_t)rgb_565);
s += 1 * 2;
d += 1 * 2;
n -= 1;
}
return len;
}
static uint64_t //
wuffs_private_impl__swizzle_bgr_565__ya_nonpremul__src(uint8_t* dst_ptr,
size_t dst_len,
@@ -4399,6 +4429,36 @@ wuffs_private_impl__swizzle_xxx__y_16be(uint8_t* dst_ptr,
return len;
}
static uint64_t //
wuffs_private_impl__swizzle_xxx__y_16le(uint8_t* dst_ptr,
size_t dst_len,
uint8_t* dst_palette_ptr,
size_t dst_palette_len,
const uint8_t* src_ptr,
size_t src_len) {
size_t dst_len3 = dst_len / 3;
size_t src_len2 = src_len / 2;
size_t len = (dst_len3 < src_len2) ? dst_len3 : src_len2;
uint8_t* d = dst_ptr;
const uint8_t* s = src_ptr;
size_t n = len;
// TODO: unroll.
while (n >= 1) {
uint8_t s0 = s[1];
d[0] = s0;
d[1] = s0;
d[2] = s0;
s += 1 * 2;
d += 1 * 3;
n -= 1;
}
return len;
}
static uint64_t //
wuffs_private_impl__swizzle_xxx__ya_nonpremul__src(uint8_t* dst_ptr,
size_t dst_len,
@@ -4679,6 +4739,32 @@ wuffs_private_impl__swizzle_xxxx__y_16be(uint8_t* dst_ptr,
return len;
}
static uint64_t //
wuffs_private_impl__swizzle_xxxx__y_16le(uint8_t* dst_ptr,
size_t dst_len,
uint8_t* dst_palette_ptr,
size_t dst_palette_len,
const uint8_t* src_ptr,
size_t src_len) {
size_t dst_len4 = dst_len / 4;
size_t src_len2 = src_len / 2;
size_t len = (dst_len4 < src_len2) ? dst_len4 : src_len2;
uint8_t* d = dst_ptr;
const uint8_t* s = src_ptr;
size_t n = len;
while (n >= 1) {
wuffs_base__poke_u32le__no_bounds_check(
d + (0 * 4), 0xFF000000 | (0x010101 * (uint32_t)s[1]));
s += 1 * 2;
d += 1 * 4;
n -= 1;
}
return len;
}
// --------
static uint64_t //
@@ -4799,6 +4885,34 @@ wuffs_private_impl__swizzle_xxxxxxxx__y_16be(uint8_t* dst_ptr,
return len;
}
static uint64_t //
wuffs_private_impl__swizzle_xxxxxxxx__y_16le(uint8_t* dst_ptr,
size_t dst_len,
uint8_t* dst_palette_ptr,
size_t dst_palette_len,
const uint8_t* src_ptr,
size_t src_len) {
size_t dst_len8 = dst_len / 8;
size_t src_len2 = src_len / 2;
size_t len = (dst_len8 < src_len2) ? dst_len8 : src_len2;
uint8_t* d = dst_ptr;
const uint8_t* s = src_ptr;
size_t n = len;
while (n >= 1) {
uint64_t s0 =
((uint64_t)(wuffs_base__peek_u16le__no_bounds_check(s + (0 * 2))));
wuffs_base__poke_u64le__no_bounds_check(
d + (0 * 8), 0xFFFF000000000000 | (0x000100010001 * s0));
s += 1 * 2;
d += 1 * 8;
n -= 1;
}
return len;
}
// --------
static uint64_t //
@@ -5264,6 +5378,32 @@ wuffs_private_impl__swizzle_y__y_16be(uint8_t* dst_ptr,
return len;
}
static uint64_t //
wuffs_private_impl__swizzle_y__y_16le(uint8_t* dst_ptr,
size_t dst_len,
uint8_t* dst_palette_ptr,
size_t dst_palette_len,
const uint8_t* src_ptr,
size_t src_len) {
size_t src_len2 = src_len / 2;
size_t len = (dst_len < src_len2) ? dst_len : src_len2;
uint8_t* d = dst_ptr;
const uint8_t* s = src_ptr;
size_t n = len;
// TODO: unroll.
while (n >= 1) {
d[0] = s[1];
s += 1 * 2;
d += 1 * 1;
n -= 1;
}
return len;
}
static uint64_t //
wuffs_private_impl__swizzle_y__ya_nonpremul__src(uint8_t* dst_ptr,
size_t dst_len,
@@ -5600,6 +5740,49 @@ wuffs_private_impl__pixel_swizzler__prepare__y_16be(
return NULL;
}
static inline WUFFS_BASE__FORCE_INLINE wuffs_base__pixel_swizzler__func //
wuffs_private_impl__pixel_swizzler__prepare__y_16le(
wuffs_base__pixel_swizzler* p,
wuffs_base__pixel_format dst_pixfmt,
wuffs_base__slice_u8 dst_palette,
wuffs_base__slice_u8 src_palette,
wuffs_base__pixel_blend blend) {
switch (dst_pixfmt.repr) {
case WUFFS_BASE__PIXEL_FORMAT__Y:
return wuffs_private_impl__swizzle_y__y_16le;
case WUFFS_BASE__PIXEL_FORMAT__Y_16LE:
return wuffs_private_impl__swizzle_copy_2_2;
case WUFFS_BASE__PIXEL_FORMAT__Y_16BE:
return wuffs_private_impl__swizzle_y_16le__y_16be;
case WUFFS_BASE__PIXEL_FORMAT__BGR_565:
return wuffs_private_impl__swizzle_bgr_565__y_16le;
case WUFFS_BASE__PIXEL_FORMAT__BGR:
case WUFFS_BASE__PIXEL_FORMAT__RGB:
return wuffs_private_impl__swizzle_xxx__y_16le;
case WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL:
case WUFFS_BASE__PIXEL_FORMAT__BGRA_PREMUL:
case WUFFS_BASE__PIXEL_FORMAT__BGRA_BINARY:
case WUFFS_BASE__PIXEL_FORMAT__BGRX:
case WUFFS_BASE__PIXEL_FORMAT__RGBA_NONPREMUL:
case WUFFS_BASE__PIXEL_FORMAT__RGBA_PREMUL:
case WUFFS_BASE__PIXEL_FORMAT__RGBA_BINARY:
case WUFFS_BASE__PIXEL_FORMAT__RGBX:
return wuffs_private_impl__swizzle_xxxx__y_16le;
case WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL_4X16LE:
case WUFFS_BASE__PIXEL_FORMAT__BGRA_PREMUL_4X16LE:
case WUFFS_BASE__PIXEL_FORMAT__RGBA_NONPREMUL_4X16LE:
case WUFFS_BASE__PIXEL_FORMAT__RGBA_PREMUL_4X16LE:
return wuffs_private_impl__swizzle_xxxxxxxx__y_16le;
}
return NULL;
}
static inline WUFFS_BASE__FORCE_INLINE wuffs_base__pixel_swizzler__func //
wuffs_private_impl__pixel_swizzler__prepare__ya_nonpremul(
wuffs_base__pixel_swizzler* p,
@@ -6901,6 +7084,11 @@ wuffs_base__pixel_swizzler__prepare(wuffs_base__pixel_swizzler* p,
p, dst_pixfmt, dst_palette, src_palette, blend);
break;
case WUFFS_BASE__PIXEL_FORMAT__Y_16LE:
func = wuffs_private_impl__pixel_swizzler__prepare__y_16le(
p, dst_pixfmt, dst_palette, src_palette, blend);
break;
case WUFFS_BASE__PIXEL_FORMAT__YA_NONPREMUL:
func = wuffs_private_impl__pixel_swizzler__prepare__ya_nonpremul(
p, dst_pixfmt, dst_palette, src_palette, blend);
+188
View File
@@ -25772,6 +25772,36 @@ wuffs_private_impl__swizzle_bgr_565__y_16be(uint8_t* dst_ptr,
return len;
}
static uint64_t //
wuffs_private_impl__swizzle_bgr_565__y_16le(uint8_t* dst_ptr,
size_t dst_len,
uint8_t* dst_palette_ptr,
size_t dst_palette_len,
const uint8_t* src_ptr,
size_t src_len) {
size_t dst_len2 = dst_len / 2;
size_t src_len2 = src_len / 2;
size_t len = (dst_len2 < src_len2) ? dst_len2 : src_len2;
uint8_t* d = dst_ptr;
const uint8_t* s = src_ptr;
size_t n = len;
// TODO: unroll.
while (n >= 1) {
uint32_t y5 = (uint32_t)(s[1] >> 3);
uint32_t y6 = (uint32_t)(s[1] >> 2);
uint32_t rgb_565 = (y5 << 11) | (y6 << 5) | (y5 << 0);
wuffs_base__poke_u16le__no_bounds_check(d + (0 * 2), (uint16_t)rgb_565);
s += 1 * 2;
d += 1 * 2;
n -= 1;
}
return len;
}
static uint64_t //
wuffs_private_impl__swizzle_bgr_565__ya_nonpremul__src(uint8_t* dst_ptr,
size_t dst_len,
@@ -28424,6 +28454,36 @@ wuffs_private_impl__swizzle_xxx__y_16be(uint8_t* dst_ptr,
return len;
}
static uint64_t //
wuffs_private_impl__swizzle_xxx__y_16le(uint8_t* dst_ptr,
size_t dst_len,
uint8_t* dst_palette_ptr,
size_t dst_palette_len,
const uint8_t* src_ptr,
size_t src_len) {
size_t dst_len3 = dst_len / 3;
size_t src_len2 = src_len / 2;
size_t len = (dst_len3 < src_len2) ? dst_len3 : src_len2;
uint8_t* d = dst_ptr;
const uint8_t* s = src_ptr;
size_t n = len;
// TODO: unroll.
while (n >= 1) {
uint8_t s0 = s[1];
d[0] = s0;
d[1] = s0;
d[2] = s0;
s += 1 * 2;
d += 1 * 3;
n -= 1;
}
return len;
}
static uint64_t //
wuffs_private_impl__swizzle_xxx__ya_nonpremul__src(uint8_t* dst_ptr,
size_t dst_len,
@@ -28704,6 +28764,32 @@ wuffs_private_impl__swizzle_xxxx__y_16be(uint8_t* dst_ptr,
return len;
}
static uint64_t //
wuffs_private_impl__swizzle_xxxx__y_16le(uint8_t* dst_ptr,
size_t dst_len,
uint8_t* dst_palette_ptr,
size_t dst_palette_len,
const uint8_t* src_ptr,
size_t src_len) {
size_t dst_len4 = dst_len / 4;
size_t src_len2 = src_len / 2;
size_t len = (dst_len4 < src_len2) ? dst_len4 : src_len2;
uint8_t* d = dst_ptr;
const uint8_t* s = src_ptr;
size_t n = len;
while (n >= 1) {
wuffs_base__poke_u32le__no_bounds_check(
d + (0 * 4), 0xFF000000 | (0x010101 * (uint32_t)s[1]));
s += 1 * 2;
d += 1 * 4;
n -= 1;
}
return len;
}
// --------
static uint64_t //
@@ -28824,6 +28910,34 @@ wuffs_private_impl__swizzle_xxxxxxxx__y_16be(uint8_t* dst_ptr,
return len;
}
static uint64_t //
wuffs_private_impl__swizzle_xxxxxxxx__y_16le(uint8_t* dst_ptr,
size_t dst_len,
uint8_t* dst_palette_ptr,
size_t dst_palette_len,
const uint8_t* src_ptr,
size_t src_len) {
size_t dst_len8 = dst_len / 8;
size_t src_len2 = src_len / 2;
size_t len = (dst_len8 < src_len2) ? dst_len8 : src_len2;
uint8_t* d = dst_ptr;
const uint8_t* s = src_ptr;
size_t n = len;
while (n >= 1) {
uint64_t s0 =
((uint64_t)(wuffs_base__peek_u16le__no_bounds_check(s + (0 * 2))));
wuffs_base__poke_u64le__no_bounds_check(
d + (0 * 8), 0xFFFF000000000000 | (0x000100010001 * s0));
s += 1 * 2;
d += 1 * 8;
n -= 1;
}
return len;
}
// --------
static uint64_t //
@@ -29289,6 +29403,32 @@ wuffs_private_impl__swizzle_y__y_16be(uint8_t* dst_ptr,
return len;
}
static uint64_t //
wuffs_private_impl__swizzle_y__y_16le(uint8_t* dst_ptr,
size_t dst_len,
uint8_t* dst_palette_ptr,
size_t dst_palette_len,
const uint8_t* src_ptr,
size_t src_len) {
size_t src_len2 = src_len / 2;
size_t len = (dst_len < src_len2) ? dst_len : src_len2;
uint8_t* d = dst_ptr;
const uint8_t* s = src_ptr;
size_t n = len;
// TODO: unroll.
while (n >= 1) {
d[0] = s[1];
s += 1 * 2;
d += 1 * 1;
n -= 1;
}
return len;
}
static uint64_t //
wuffs_private_impl__swizzle_y__ya_nonpremul__src(uint8_t* dst_ptr,
size_t dst_len,
@@ -29625,6 +29765,49 @@ wuffs_private_impl__pixel_swizzler__prepare__y_16be(
return NULL;
}
static inline WUFFS_BASE__FORCE_INLINE wuffs_base__pixel_swizzler__func //
wuffs_private_impl__pixel_swizzler__prepare__y_16le(
wuffs_base__pixel_swizzler* p,
wuffs_base__pixel_format dst_pixfmt,
wuffs_base__slice_u8 dst_palette,
wuffs_base__slice_u8 src_palette,
wuffs_base__pixel_blend blend) {
switch (dst_pixfmt.repr) {
case WUFFS_BASE__PIXEL_FORMAT__Y:
return wuffs_private_impl__swizzle_y__y_16le;
case WUFFS_BASE__PIXEL_FORMAT__Y_16LE:
return wuffs_private_impl__swizzle_copy_2_2;
case WUFFS_BASE__PIXEL_FORMAT__Y_16BE:
return wuffs_private_impl__swizzle_y_16le__y_16be;
case WUFFS_BASE__PIXEL_FORMAT__BGR_565:
return wuffs_private_impl__swizzle_bgr_565__y_16le;
case WUFFS_BASE__PIXEL_FORMAT__BGR:
case WUFFS_BASE__PIXEL_FORMAT__RGB:
return wuffs_private_impl__swizzle_xxx__y_16le;
case WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL:
case WUFFS_BASE__PIXEL_FORMAT__BGRA_PREMUL:
case WUFFS_BASE__PIXEL_FORMAT__BGRA_BINARY:
case WUFFS_BASE__PIXEL_FORMAT__BGRX:
case WUFFS_BASE__PIXEL_FORMAT__RGBA_NONPREMUL:
case WUFFS_BASE__PIXEL_FORMAT__RGBA_PREMUL:
case WUFFS_BASE__PIXEL_FORMAT__RGBA_BINARY:
case WUFFS_BASE__PIXEL_FORMAT__RGBX:
return wuffs_private_impl__swizzle_xxxx__y_16le;
case WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL_4X16LE:
case WUFFS_BASE__PIXEL_FORMAT__BGRA_PREMUL_4X16LE:
case WUFFS_BASE__PIXEL_FORMAT__RGBA_NONPREMUL_4X16LE:
case WUFFS_BASE__PIXEL_FORMAT__RGBA_PREMUL_4X16LE:
return wuffs_private_impl__swizzle_xxxxxxxx__y_16le;
}
return NULL;
}
static inline WUFFS_BASE__FORCE_INLINE wuffs_base__pixel_swizzler__func //
wuffs_private_impl__pixel_swizzler__prepare__ya_nonpremul(
wuffs_base__pixel_swizzler* p,
@@ -30926,6 +31109,11 @@ wuffs_base__pixel_swizzler__prepare(wuffs_base__pixel_swizzler* p,
p, dst_pixfmt, dst_palette, src_palette, blend);
break;
case WUFFS_BASE__PIXEL_FORMAT__Y_16LE:
func = wuffs_private_impl__pixel_swizzler__prepare__y_16le(
p, dst_pixfmt, dst_palette, src_palette, blend);
break;
case WUFFS_BASE__PIXEL_FORMAT__YA_NONPREMUL:
func = wuffs_private_impl__pixel_swizzler__prepare__ya_nonpremul(
p, dst_pixfmt, dst_palette, src_palette, blend);
+4
View File
@@ -317,6 +317,10 @@ test_wuffs_pixel_swizzler_swizzle() {
.color = 0xFF444444,
.pixfmt_repr = WUFFS_BASE__PIXEL_FORMAT__Y_16BE,
},
{
.color = 0xFF444444,
.pixfmt_repr = WUFFS_BASE__PIXEL_FORMAT__Y_16LE,
},
{
.color = 0x55444444,
.pixfmt_repr = WUFFS_BASE__PIXEL_FORMAT__YA_NONPREMUL,