mirror of
https://github.com/ddidderr/wuffs.git
synced 2026-11-18 00:32:11 +01:00
pixconv: allow decoding to PIXEL_FORMAT__RGB
"wuffs genlib" binary size changes: 77936 clang-static/wuffs-base-pixconv.o # Before = 1.00x 79792 clang-static/wuffs-base-pixconv.o # After = 1.02x 173784 gcc-static/wuffs-base-pixconv.o # Before = 1.00x 177112 gcc-static/wuffs-base-pixconv.o # After = 1.02x Some of the benchmark numbers move around even though they don't use the new WUFFS_BASE__PIXEL_FORMAT__RGB code paths. It's possibly just a code alignment coincidence per https://news.ycombinator.com/item?id=23633583 name old speed new speed delta wuffs_jpeg_decode_19k_8bpp/clang11 249MB/s ± 0% 251MB/s ± 0% +0.76% (p=0.008 n=5+5) wuffs_jpeg_decode_30k_24bpp_progressive/clang11 222MB/s ± 0% 225MB/s ± 0% +1.16% (p=0.008 n=5+5) wuffs_jpeg_decode_30k_24bpp_sequential/clang11 405MB/s ± 0% 406MB/s ± 0% ~ (p=1.000 n=5+5) wuffs_jpeg_decode_77k_24bpp/clang11 357MB/s ± 0% 356MB/s ± 0% -0.24% (p=0.008 n=5+5) wuffs_jpeg_decode_552k_24bpp_420/clang11 370MB/s ± 0% 372MB/s ± 0% +0.46% (p=0.008 n=5+5) wuffs_jpeg_decode_552k_24bpp_444/clang11 504MB/s ± 0% 508MB/s ± 0% +0.83% (p=0.008 n=5+5) wuffs_jpeg_decode_4002k_24bpp/clang11 375MB/s ± 0% 374MB/s ± 0% ~ (p=0.095 n=5+5) wuffs_jpeg_decode_19k_8bpp/gcc10 258MB/s ± 0% 254MB/s ± 0% -1.68% (p=0.008 n=5+5) wuffs_jpeg_decode_30k_24bpp_progressive/gcc10 267MB/s ± 0% 240MB/s ± 0% -9.95% (p=0.008 n=5+5) wuffs_jpeg_decode_30k_24bpp_sequential/gcc10 537MB/s ± 0% 537MB/s ± 0% ~ (p=0.556 n=4+5) wuffs_jpeg_decode_77k_24bpp/gcc10 458MB/s ± 0% 453MB/s ± 0% -1.18% (p=0.008 n=5+5) wuffs_jpeg_decode_552k_24bpp_420/gcc10 482MB/s ± 0% 478MB/s ± 0% -0.78% (p=0.008 n=5+5) wuffs_jpeg_decode_552k_24bpp_444/gcc10 508MB/s ± 0% 511MB/s ± 0% +0.49% (p=0.008 n=5+5) wuffs_jpeg_decode_4002k_24bpp/gcc10 489MB/s ± 0% 484MB/s ± 0% -1.11% (p=0.016 n=4+5) wuffs_png_decode_image_19k_8bpp/clang11 269MB/s ± 0% 275MB/s ± 0% +2.25% (p=0.008 n=5+5) wuffs_png_decode_image_40k_24bpp/clang11 328MB/s ± 0% 328MB/s ± 0% ~ (p=0.841 n=5+5) wuffs_png_decode_image_77k_8bpp/clang11 949MB/s ± 0% 962MB/s ± 0% +1.29% (p=0.008 n=5+5) wuffs_png_decode_image_552k_32bpp_ignore_checksum/clang11 854MB/s ± 0% 859MB/s ± 0% +0.54% (p=0.008 n=5+5) wuffs_png_decode_image_552k_32bpp_verify_checksum/clang11 822MB/s ± 0% 826MB/s ± 0% +0.52% (p=0.008 n=5+5) wuffs_png_decode_image_4002k_24bpp/clang11 331MB/s ± 0% 332MB/s ± 0% +0.15% (p=0.008 n=5+5) wuffs_png_decode_image_19k_8bpp/gcc10 287MB/s ± 0% 277MB/s ± 0% -3.46% (p=0.008 n=5+5) wuffs_png_decode_image_40k_24bpp/gcc10 341MB/s ± 0% 346MB/s ± 0% +1.34% (p=0.008 n=5+5) wuffs_png_decode_image_77k_8bpp/gcc10 1.02GB/s ± 0% 1.01GB/s ± 0% -0.41% (p=0.008 n=5+5) wuffs_png_decode_image_552k_32bpp_ignore_checksum/gcc10 939MB/s ± 0% 916MB/s ± 0% -2.50% (p=0.008 n=5+5) wuffs_png_decode_image_552k_32bpp_verify_checksum/gcc10 895MB/s ± 0% 874MB/s ± 0% -2.41% (p=0.008 n=5+5) wuffs_png_decode_image_4002k_24bpp/gcc10 352MB/s ± 0% 350MB/s ± 0% -0.44% (p=0.008 n=5+5) Updates #131
This commit is contained in:
1 parent
129d8008a2
commit
8954281a4e
5 files changed
+420
-20
No files matched your search
@@ -465,6 +465,7 @@ redirect:
|
||||
case WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL:
|
||||
case WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL_4X16LE:
|
||||
case WUFFS_BASE__PIXEL_FORMAT__BGRA_PREMUL:
|
||||
case WUFFS_BASE__PIXEL_FORMAT__RGB:
|
||||
case WUFFS_BASE__PIXEL_FORMAT__RGBA_NONPREMUL:
|
||||
case WUFFS_BASE__PIXEL_FORMAT__RGBA_PREMUL:
|
||||
break;
|
||||
|
||||
@@ -123,6 +123,7 @@ class DecodeImageCallbacks {
|
||||
// - WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL
|
||||
// - WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL_4X16LE
|
||||
// - WUFFS_BASE__PIXEL_FORMAT__BGRA_PREMUL
|
||||
// - WUFFS_BASE__PIXEL_FORMAT__RGB
|
||||
// - WUFFS_BASE__PIXEL_FORMAT__RGBA_NONPREMUL
|
||||
// - WUFFS_BASE__PIXEL_FORMAT__RGBA_PREMUL
|
||||
// or return image_config.pixcfg.pixel_format(). The latter means to use the
|
||||
|
||||
@@ -1990,6 +1990,37 @@ wuffs_base__pixel_swizzler__bgr__rgba_nonpremul__src(uint8_t* dst_ptr,
|
||||
return len;
|
||||
}
|
||||
|
||||
static uint64_t //
|
||||
wuffs_base__pixel_swizzler__bgr__rgba_nonpremul_4x16le__src(
|
||||
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_len8 = src_len / 8;
|
||||
size_t len = (dst_len3 < src_len8) ? dst_len3 : src_len8;
|
||||
uint8_t* d = dst_ptr;
|
||||
const uint8_t* s = src_ptr;
|
||||
size_t n = len;
|
||||
|
||||
// TODO: unroll.
|
||||
|
||||
while (n >= 1) {
|
||||
uint32_t s0 = wuffs_base__swap_u32_argb_abgr(
|
||||
wuffs_base__color_u64_argb_nonpremul__as__color_u32_argb_premul(
|
||||
wuffs_base__peek_u64le__no_bounds_check(s + (0 * 8))));
|
||||
wuffs_base__poke_u24le__no_bounds_check(d + (0 * 3), s0);
|
||||
|
||||
s += 1 * 8;
|
||||
d += 1 * 3;
|
||||
n -= 1;
|
||||
}
|
||||
|
||||
return len;
|
||||
}
|
||||
|
||||
static uint64_t //
|
||||
wuffs_base__pixel_swizzler__bgr__rgba_nonpremul__src_over(
|
||||
uint8_t* dst_ptr,
|
||||
@@ -2038,6 +2069,54 @@ wuffs_base__pixel_swizzler__bgr__rgba_nonpremul__src_over(
|
||||
return len;
|
||||
}
|
||||
|
||||
static uint64_t //
|
||||
wuffs_base__pixel_swizzler__bgr__rgba_nonpremul_4x16le__src_over(
|
||||
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_len8 = src_len / 8;
|
||||
size_t len = (dst_len3 < src_len8) ? dst_len3 : src_len8;
|
||||
uint8_t* d = dst_ptr;
|
||||
const uint8_t* s = src_ptr;
|
||||
size_t n = len;
|
||||
|
||||
// TODO: unroll.
|
||||
|
||||
while (n >= 1) {
|
||||
// Extract 16-bit color components.
|
||||
uint32_t dr = 0x101 * ((uint32_t)d[2]);
|
||||
uint32_t dg = 0x101 * ((uint32_t)d[1]);
|
||||
uint32_t db = 0x101 * ((uint32_t)d[0]);
|
||||
uint32_t sa = ((uint32_t)wuffs_base__peek_u16le__no_bounds_check(s + 6));
|
||||
uint32_t sb = ((uint32_t)wuffs_base__peek_u16le__no_bounds_check(s + 4));
|
||||
uint32_t sg = ((uint32_t)wuffs_base__peek_u16le__no_bounds_check(s + 2));
|
||||
uint32_t sr = ((uint32_t)wuffs_base__peek_u16le__no_bounds_check(s + 0));
|
||||
|
||||
// Calculate the inverse of the src-alpha: how much of the dst to keep.
|
||||
uint32_t ia = 0xFFFF - sa;
|
||||
|
||||
// Composite src (nonpremul) over dst (premul).
|
||||
dr = ((sr * sa) + (dr * ia)) / 0xFFFF;
|
||||
dg = ((sg * sa) + (dg * ia)) / 0xFFFF;
|
||||
db = ((sb * sa) + (db * ia)) / 0xFFFF;
|
||||
|
||||
// Convert from 16-bit color to 8-bit color.
|
||||
d[0] = (uint8_t)(db >> 8);
|
||||
d[1] = (uint8_t)(dg >> 8);
|
||||
d[2] = (uint8_t)(dr >> 8);
|
||||
|
||||
s += 1 * 8;
|
||||
d += 1 * 3;
|
||||
n -= 1;
|
||||
}
|
||||
|
||||
return len;
|
||||
}
|
||||
|
||||
static uint64_t //
|
||||
wuffs_base__pixel_swizzler__bgr__rgba_premul__src(uint8_t* dst_ptr,
|
||||
size_t dst_len,
|
||||
@@ -2113,6 +2192,38 @@ wuffs_base__pixel_swizzler__bgr__rgba_premul__src_over(uint8_t* dst_ptr,
|
||||
return len;
|
||||
}
|
||||
|
||||
static uint64_t //
|
||||
wuffs_base__pixel_swizzler__bgr__rgbx(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_len4 = src_len / 4;
|
||||
size_t len = (dst_len3 < src_len4) ? dst_len3 : src_len4;
|
||||
uint8_t* d = dst_ptr;
|
||||
const uint8_t* s = src_ptr;
|
||||
size_t n = len;
|
||||
|
||||
// TODO: unroll.
|
||||
|
||||
while (n >= 1) {
|
||||
uint8_t b0 = s[0];
|
||||
uint8_t b1 = s[1];
|
||||
uint8_t b2 = s[2];
|
||||
d[0] = b2;
|
||||
d[1] = b1;
|
||||
d[2] = b0;
|
||||
|
||||
s += 1 * 4;
|
||||
d += 1 * 3;
|
||||
n -= 1;
|
||||
}
|
||||
|
||||
return len;
|
||||
}
|
||||
|
||||
// --------
|
||||
|
||||
static uint64_t //
|
||||
@@ -3409,6 +3520,39 @@ wuffs_base__pixel_swizzler__bgrw_4x16le__rgb(uint8_t* dst_ptr,
|
||||
|
||||
// --------
|
||||
|
||||
static uint64_t //
|
||||
wuffs_base__pixel_swizzler__rgb__bgr_565(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) {
|
||||
wuffs_base__poke_u24le__no_bounds_check(
|
||||
d + (0 * 3),
|
||||
wuffs_base__swap_u32_argb_abgr(
|
||||
wuffs_base__color_u16_rgb_565__as__color_u32_argb_premul(
|
||||
wuffs_base__peek_u16le__no_bounds_check(s + (0 * 2)))));
|
||||
|
||||
s += 1 * 2;
|
||||
d += 1 * 3;
|
||||
n -= 1;
|
||||
}
|
||||
|
||||
return len;
|
||||
}
|
||||
|
||||
// --------
|
||||
|
||||
static uint64_t //
|
||||
wuffs_base__pixel_swizzler__rgba_nonpremul__bgra_nonpremul_4x16le__src(
|
||||
uint8_t* dst_ptr,
|
||||
@@ -4359,8 +4503,25 @@ wuffs_base__pixel_swizzler__prepare__indexed__bgra_nonpremul(
|
||||
return NULL;
|
||||
|
||||
case WUFFS_BASE__PIXEL_FORMAT__RGB:
|
||||
// TODO.
|
||||
break;
|
||||
switch (blend) {
|
||||
case WUFFS_BASE__PIXEL_BLEND__SRC:
|
||||
if (wuffs_base__pixel_swizzler__bgra_premul__rgba_nonpremul__src(
|
||||
dst_palette.ptr, dst_palette.len, NULL, 0, src_palette.ptr,
|
||||
src_palette.len) !=
|
||||
(WUFFS_BASE__PIXEL_FORMAT__INDEXED__PALETTE_BYTE_LENGTH / 4)) {
|
||||
return NULL;
|
||||
}
|
||||
return wuffs_base__pixel_swizzler__xxx__index__src;
|
||||
case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:
|
||||
if (wuffs_base__pixel_swizzler__swap_rgbx_bgrx(
|
||||
dst_palette.ptr, dst_palette.len, NULL, 0, src_palette.ptr,
|
||||
src_palette.len) !=
|
||||
(WUFFS_BASE__PIXEL_FORMAT__INDEXED__PALETTE_BYTE_LENGTH / 4)) {
|
||||
return NULL;
|
||||
}
|
||||
return wuffs_base__pixel_swizzler__xxx__index_bgra_nonpremul__src_over;
|
||||
}
|
||||
return NULL;
|
||||
|
||||
case WUFFS_BASE__PIXEL_FORMAT__RGBA_NONPREMUL:
|
||||
if (wuffs_base__pixel_swizzler__swap_rgbx_bgrx(
|
||||
@@ -4542,6 +4703,9 @@ wuffs_base__pixel_swizzler__prepare__bgr_565(
|
||||
case WUFFS_BASE__PIXEL_FORMAT__BGRA_PREMUL_4X16LE:
|
||||
return wuffs_base__pixel_swizzler__bgrw_4x16le__bgr_565;
|
||||
|
||||
case WUFFS_BASE__PIXEL_FORMAT__RGB:
|
||||
return wuffs_base__pixel_swizzler__rgb__bgr_565;
|
||||
|
||||
case WUFFS_BASE__PIXEL_FORMAT__RGBA_NONPREMUL:
|
||||
case WUFFS_BASE__PIXEL_FORMAT__RGBA_PREMUL:
|
||||
case WUFFS_BASE__PIXEL_FORMAT__RGBA_BINARY:
|
||||
@@ -4650,8 +4814,13 @@ wuffs_base__pixel_swizzler__prepare__bgra_nonpremul(
|
||||
break;
|
||||
|
||||
case WUFFS_BASE__PIXEL_FORMAT__RGB:
|
||||
// TODO.
|
||||
break;
|
||||
switch (blend) {
|
||||
case WUFFS_BASE__PIXEL_BLEND__SRC:
|
||||
return wuffs_base__pixel_swizzler__bgr__rgba_nonpremul__src;
|
||||
case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:
|
||||
return wuffs_base__pixel_swizzler__bgr__rgba_nonpremul__src_over;
|
||||
}
|
||||
return NULL;
|
||||
|
||||
case WUFFS_BASE__PIXEL_FORMAT__RGBA_NONPREMUL:
|
||||
switch (blend) {
|
||||
@@ -4743,8 +4912,13 @@ wuffs_base__pixel_swizzler__prepare__bgra_nonpremul_4x16le(
|
||||
break;
|
||||
|
||||
case WUFFS_BASE__PIXEL_FORMAT__RGB:
|
||||
// TODO.
|
||||
break;
|
||||
switch (blend) {
|
||||
case WUFFS_BASE__PIXEL_BLEND__SRC:
|
||||
return wuffs_base__pixel_swizzler__bgr__rgba_nonpremul_4x16le__src;
|
||||
case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:
|
||||
return wuffs_base__pixel_swizzler__bgr__rgba_nonpremul_4x16le__src_over;
|
||||
}
|
||||
return NULL;
|
||||
|
||||
case WUFFS_BASE__PIXEL_FORMAT__RGBA_NONPREMUL:
|
||||
switch (blend) {
|
||||
@@ -4825,6 +4999,15 @@ wuffs_base__pixel_swizzler__prepare__bgra_premul(
|
||||
}
|
||||
return NULL;
|
||||
|
||||
case WUFFS_BASE__PIXEL_FORMAT__RGB:
|
||||
switch (blend) {
|
||||
case WUFFS_BASE__PIXEL_BLEND__SRC:
|
||||
return wuffs_base__pixel_swizzler__bgr__rgba_premul__src;
|
||||
case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:
|
||||
return wuffs_base__pixel_swizzler__bgr__rgba_premul__src_over;
|
||||
}
|
||||
return NULL;
|
||||
|
||||
case WUFFS_BASE__PIXEL_FORMAT__RGBA_NONPREMUL:
|
||||
switch (blend) {
|
||||
case WUFFS_BASE__PIXEL_BLEND__SRC:
|
||||
@@ -4876,8 +5059,7 @@ wuffs_base__pixel_swizzler__prepare__bgrx(wuffs_base__pixel_swizzler* p,
|
||||
return wuffs_base__pixel_swizzler__copy_4_4;
|
||||
|
||||
case WUFFS_BASE__PIXEL_FORMAT__RGB:
|
||||
// TODO.
|
||||
break;
|
||||
return wuffs_base__pixel_swizzler__bgr__rgbx;
|
||||
|
||||
case WUFFS_BASE__PIXEL_FORMAT__RGBA_NONPREMUL:
|
||||
case WUFFS_BASE__PIXEL_FORMAT__RGBA_PREMUL:
|
||||
@@ -4991,8 +5173,13 @@ wuffs_base__pixel_swizzler__prepare__rgba_nonpremul(
|
||||
break;
|
||||
|
||||
case WUFFS_BASE__PIXEL_FORMAT__RGB:
|
||||
// TODO.
|
||||
break;
|
||||
switch (blend) {
|
||||
case WUFFS_BASE__PIXEL_BLEND__SRC:
|
||||
return wuffs_base__pixel_swizzler__bgr__bgra_nonpremul__src;
|
||||
case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:
|
||||
return wuffs_base__pixel_swizzler__bgr__bgra_nonpremul__src_over;
|
||||
}
|
||||
return NULL;
|
||||
|
||||
case WUFFS_BASE__PIXEL_FORMAT__RGBA_NONPREMUL:
|
||||
switch (blend) {
|
||||
@@ -5078,6 +5265,15 @@ wuffs_base__pixel_swizzler__prepare__rgba_premul(
|
||||
}
|
||||
return NULL;
|
||||
|
||||
case WUFFS_BASE__PIXEL_FORMAT__RGB:
|
||||
switch (blend) {
|
||||
case WUFFS_BASE__PIXEL_BLEND__SRC:
|
||||
return wuffs_base__pixel_swizzler__bgr__bgra_premul__src;
|
||||
case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:
|
||||
return wuffs_base__pixel_swizzler__bgr__bgra_premul__src_over;
|
||||
}
|
||||
return NULL;
|
||||
|
||||
case WUFFS_BASE__PIXEL_FORMAT__RGBA_NONPREMUL:
|
||||
switch (blend) {
|
||||
case WUFFS_BASE__PIXEL_BLEND__SRC:
|
||||
|
||||
@@ -11926,6 +11926,7 @@ class DecodeImageCallbacks {
|
||||
// - WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL
|
||||
// - WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL_4X16LE
|
||||
// - WUFFS_BASE__PIXEL_FORMAT__BGRA_PREMUL
|
||||
// - WUFFS_BASE__PIXEL_FORMAT__RGB
|
||||
// - WUFFS_BASE__PIXEL_FORMAT__RGBA_NONPREMUL
|
||||
// - WUFFS_BASE__PIXEL_FORMAT__RGBA_PREMUL
|
||||
// or return image_config.pixcfg.pixel_format(). The latter means to use the
|
||||
@@ -19623,6 +19624,37 @@ wuffs_base__pixel_swizzler__bgr__rgba_nonpremul__src(uint8_t* dst_ptr,
|
||||
return len;
|
||||
}
|
||||
|
||||
static uint64_t //
|
||||
wuffs_base__pixel_swizzler__bgr__rgba_nonpremul_4x16le__src(
|
||||
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_len8 = src_len / 8;
|
||||
size_t len = (dst_len3 < src_len8) ? dst_len3 : src_len8;
|
||||
uint8_t* d = dst_ptr;
|
||||
const uint8_t* s = src_ptr;
|
||||
size_t n = len;
|
||||
|
||||
// TODO: unroll.
|
||||
|
||||
while (n >= 1) {
|
||||
uint32_t s0 = wuffs_base__swap_u32_argb_abgr(
|
||||
wuffs_base__color_u64_argb_nonpremul__as__color_u32_argb_premul(
|
||||
wuffs_base__peek_u64le__no_bounds_check(s + (0 * 8))));
|
||||
wuffs_base__poke_u24le__no_bounds_check(d + (0 * 3), s0);
|
||||
|
||||
s += 1 * 8;
|
||||
d += 1 * 3;
|
||||
n -= 1;
|
||||
}
|
||||
|
||||
return len;
|
||||
}
|
||||
|
||||
static uint64_t //
|
||||
wuffs_base__pixel_swizzler__bgr__rgba_nonpremul__src_over(
|
||||
uint8_t* dst_ptr,
|
||||
@@ -19671,6 +19703,54 @@ wuffs_base__pixel_swizzler__bgr__rgba_nonpremul__src_over(
|
||||
return len;
|
||||
}
|
||||
|
||||
static uint64_t //
|
||||
wuffs_base__pixel_swizzler__bgr__rgba_nonpremul_4x16le__src_over(
|
||||
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_len8 = src_len / 8;
|
||||
size_t len = (dst_len3 < src_len8) ? dst_len3 : src_len8;
|
||||
uint8_t* d = dst_ptr;
|
||||
const uint8_t* s = src_ptr;
|
||||
size_t n = len;
|
||||
|
||||
// TODO: unroll.
|
||||
|
||||
while (n >= 1) {
|
||||
// Extract 16-bit color components.
|
||||
uint32_t dr = 0x101 * ((uint32_t)d[2]);
|
||||
uint32_t dg = 0x101 * ((uint32_t)d[1]);
|
||||
uint32_t db = 0x101 * ((uint32_t)d[0]);
|
||||
uint32_t sa = ((uint32_t)wuffs_base__peek_u16le__no_bounds_check(s + 6));
|
||||
uint32_t sb = ((uint32_t)wuffs_base__peek_u16le__no_bounds_check(s + 4));
|
||||
uint32_t sg = ((uint32_t)wuffs_base__peek_u16le__no_bounds_check(s + 2));
|
||||
uint32_t sr = ((uint32_t)wuffs_base__peek_u16le__no_bounds_check(s + 0));
|
||||
|
||||
// Calculate the inverse of the src-alpha: how much of the dst to keep.
|
||||
uint32_t ia = 0xFFFF - sa;
|
||||
|
||||
// Composite src (nonpremul) over dst (premul).
|
||||
dr = ((sr * sa) + (dr * ia)) / 0xFFFF;
|
||||
dg = ((sg * sa) + (dg * ia)) / 0xFFFF;
|
||||
db = ((sb * sa) + (db * ia)) / 0xFFFF;
|
||||
|
||||
// Convert from 16-bit color to 8-bit color.
|
||||
d[0] = (uint8_t)(db >> 8);
|
||||
d[1] = (uint8_t)(dg >> 8);
|
||||
d[2] = (uint8_t)(dr >> 8);
|
||||
|
||||
s += 1 * 8;
|
||||
d += 1 * 3;
|
||||
n -= 1;
|
||||
}
|
||||
|
||||
return len;
|
||||
}
|
||||
|
||||
static uint64_t //
|
||||
wuffs_base__pixel_swizzler__bgr__rgba_premul__src(uint8_t* dst_ptr,
|
||||
size_t dst_len,
|
||||
@@ -19746,6 +19826,38 @@ wuffs_base__pixel_swizzler__bgr__rgba_premul__src_over(uint8_t* dst_ptr,
|
||||
return len;
|
||||
}
|
||||
|
||||
static uint64_t //
|
||||
wuffs_base__pixel_swizzler__bgr__rgbx(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_len4 = src_len / 4;
|
||||
size_t len = (dst_len3 < src_len4) ? dst_len3 : src_len4;
|
||||
uint8_t* d = dst_ptr;
|
||||
const uint8_t* s = src_ptr;
|
||||
size_t n = len;
|
||||
|
||||
// TODO: unroll.
|
||||
|
||||
while (n >= 1) {
|
||||
uint8_t b0 = s[0];
|
||||
uint8_t b1 = s[1];
|
||||
uint8_t b2 = s[2];
|
||||
d[0] = b2;
|
||||
d[1] = b1;
|
||||
d[2] = b0;
|
||||
|
||||
s += 1 * 4;
|
||||
d += 1 * 3;
|
||||
n -= 1;
|
||||
}
|
||||
|
||||
return len;
|
||||
}
|
||||
|
||||
// --------
|
||||
|
||||
static uint64_t //
|
||||
@@ -21042,6 +21154,39 @@ wuffs_base__pixel_swizzler__bgrw_4x16le__rgb(uint8_t* dst_ptr,
|
||||
|
||||
// --------
|
||||
|
||||
static uint64_t //
|
||||
wuffs_base__pixel_swizzler__rgb__bgr_565(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) {
|
||||
wuffs_base__poke_u24le__no_bounds_check(
|
||||
d + (0 * 3),
|
||||
wuffs_base__swap_u32_argb_abgr(
|
||||
wuffs_base__color_u16_rgb_565__as__color_u32_argb_premul(
|
||||
wuffs_base__peek_u16le__no_bounds_check(s + (0 * 2)))));
|
||||
|
||||
s += 1 * 2;
|
||||
d += 1 * 3;
|
||||
n -= 1;
|
||||
}
|
||||
|
||||
return len;
|
||||
}
|
||||
|
||||
// --------
|
||||
|
||||
static uint64_t //
|
||||
wuffs_base__pixel_swizzler__rgba_nonpremul__bgra_nonpremul_4x16le__src(
|
||||
uint8_t* dst_ptr,
|
||||
@@ -21992,8 +22137,25 @@ wuffs_base__pixel_swizzler__prepare__indexed__bgra_nonpremul(
|
||||
return NULL;
|
||||
|
||||
case WUFFS_BASE__PIXEL_FORMAT__RGB:
|
||||
// TODO.
|
||||
break;
|
||||
switch (blend) {
|
||||
case WUFFS_BASE__PIXEL_BLEND__SRC:
|
||||
if (wuffs_base__pixel_swizzler__bgra_premul__rgba_nonpremul__src(
|
||||
dst_palette.ptr, dst_palette.len, NULL, 0, src_palette.ptr,
|
||||
src_palette.len) !=
|
||||
(WUFFS_BASE__PIXEL_FORMAT__INDEXED__PALETTE_BYTE_LENGTH / 4)) {
|
||||
return NULL;
|
||||
}
|
||||
return wuffs_base__pixel_swizzler__xxx__index__src;
|
||||
case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:
|
||||
if (wuffs_base__pixel_swizzler__swap_rgbx_bgrx(
|
||||
dst_palette.ptr, dst_palette.len, NULL, 0, src_palette.ptr,
|
||||
src_palette.len) !=
|
||||
(WUFFS_BASE__PIXEL_FORMAT__INDEXED__PALETTE_BYTE_LENGTH / 4)) {
|
||||
return NULL;
|
||||
}
|
||||
return wuffs_base__pixel_swizzler__xxx__index_bgra_nonpremul__src_over;
|
||||
}
|
||||
return NULL;
|
||||
|
||||
case WUFFS_BASE__PIXEL_FORMAT__RGBA_NONPREMUL:
|
||||
if (wuffs_base__pixel_swizzler__swap_rgbx_bgrx(
|
||||
@@ -22175,6 +22337,9 @@ wuffs_base__pixel_swizzler__prepare__bgr_565(
|
||||
case WUFFS_BASE__PIXEL_FORMAT__BGRA_PREMUL_4X16LE:
|
||||
return wuffs_base__pixel_swizzler__bgrw_4x16le__bgr_565;
|
||||
|
||||
case WUFFS_BASE__PIXEL_FORMAT__RGB:
|
||||
return wuffs_base__pixel_swizzler__rgb__bgr_565;
|
||||
|
||||
case WUFFS_BASE__PIXEL_FORMAT__RGBA_NONPREMUL:
|
||||
case WUFFS_BASE__PIXEL_FORMAT__RGBA_PREMUL:
|
||||
case WUFFS_BASE__PIXEL_FORMAT__RGBA_BINARY:
|
||||
@@ -22283,8 +22448,13 @@ wuffs_base__pixel_swizzler__prepare__bgra_nonpremul(
|
||||
break;
|
||||
|
||||
case WUFFS_BASE__PIXEL_FORMAT__RGB:
|
||||
// TODO.
|
||||
break;
|
||||
switch (blend) {
|
||||
case WUFFS_BASE__PIXEL_BLEND__SRC:
|
||||
return wuffs_base__pixel_swizzler__bgr__rgba_nonpremul__src;
|
||||
case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:
|
||||
return wuffs_base__pixel_swizzler__bgr__rgba_nonpremul__src_over;
|
||||
}
|
||||
return NULL;
|
||||
|
||||
case WUFFS_BASE__PIXEL_FORMAT__RGBA_NONPREMUL:
|
||||
switch (blend) {
|
||||
@@ -22376,8 +22546,13 @@ wuffs_base__pixel_swizzler__prepare__bgra_nonpremul_4x16le(
|
||||
break;
|
||||
|
||||
case WUFFS_BASE__PIXEL_FORMAT__RGB:
|
||||
// TODO.
|
||||
break;
|
||||
switch (blend) {
|
||||
case WUFFS_BASE__PIXEL_BLEND__SRC:
|
||||
return wuffs_base__pixel_swizzler__bgr__rgba_nonpremul_4x16le__src;
|
||||
case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:
|
||||
return wuffs_base__pixel_swizzler__bgr__rgba_nonpremul_4x16le__src_over;
|
||||
}
|
||||
return NULL;
|
||||
|
||||
case WUFFS_BASE__PIXEL_FORMAT__RGBA_NONPREMUL:
|
||||
switch (blend) {
|
||||
@@ -22458,6 +22633,15 @@ wuffs_base__pixel_swizzler__prepare__bgra_premul(
|
||||
}
|
||||
return NULL;
|
||||
|
||||
case WUFFS_BASE__PIXEL_FORMAT__RGB:
|
||||
switch (blend) {
|
||||
case WUFFS_BASE__PIXEL_BLEND__SRC:
|
||||
return wuffs_base__pixel_swizzler__bgr__rgba_premul__src;
|
||||
case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:
|
||||
return wuffs_base__pixel_swizzler__bgr__rgba_premul__src_over;
|
||||
}
|
||||
return NULL;
|
||||
|
||||
case WUFFS_BASE__PIXEL_FORMAT__RGBA_NONPREMUL:
|
||||
switch (blend) {
|
||||
case WUFFS_BASE__PIXEL_BLEND__SRC:
|
||||
@@ -22509,8 +22693,7 @@ wuffs_base__pixel_swizzler__prepare__bgrx(wuffs_base__pixel_swizzler* p,
|
||||
return wuffs_base__pixel_swizzler__copy_4_4;
|
||||
|
||||
case WUFFS_BASE__PIXEL_FORMAT__RGB:
|
||||
// TODO.
|
||||
break;
|
||||
return wuffs_base__pixel_swizzler__bgr__rgbx;
|
||||
|
||||
case WUFFS_BASE__PIXEL_FORMAT__RGBA_NONPREMUL:
|
||||
case WUFFS_BASE__PIXEL_FORMAT__RGBA_PREMUL:
|
||||
@@ -22624,8 +22807,13 @@ wuffs_base__pixel_swizzler__prepare__rgba_nonpremul(
|
||||
break;
|
||||
|
||||
case WUFFS_BASE__PIXEL_FORMAT__RGB:
|
||||
// TODO.
|
||||
break;
|
||||
switch (blend) {
|
||||
case WUFFS_BASE__PIXEL_BLEND__SRC:
|
||||
return wuffs_base__pixel_swizzler__bgr__bgra_nonpremul__src;
|
||||
case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:
|
||||
return wuffs_base__pixel_swizzler__bgr__bgra_nonpremul__src_over;
|
||||
}
|
||||
return NULL;
|
||||
|
||||
case WUFFS_BASE__PIXEL_FORMAT__RGBA_NONPREMUL:
|
||||
switch (blend) {
|
||||
@@ -22711,6 +22899,15 @@ wuffs_base__pixel_swizzler__prepare__rgba_premul(
|
||||
}
|
||||
return NULL;
|
||||
|
||||
case WUFFS_BASE__PIXEL_FORMAT__RGB:
|
||||
switch (blend) {
|
||||
case WUFFS_BASE__PIXEL_BLEND__SRC:
|
||||
return wuffs_base__pixel_swizzler__bgr__bgra_premul__src;
|
||||
case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:
|
||||
return wuffs_base__pixel_swizzler__bgr__bgra_premul__src_over;
|
||||
}
|
||||
return NULL;
|
||||
|
||||
case WUFFS_BASE__PIXEL_FORMAT__RGBA_NONPREMUL:
|
||||
switch (blend) {
|
||||
case WUFFS_BASE__PIXEL_BLEND__SRC:
|
||||
@@ -57593,6 +57790,7 @@ redirect:
|
||||
case WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL:
|
||||
case WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL_4X16LE:
|
||||
case WUFFS_BASE__PIXEL_FORMAT__BGRA_PREMUL:
|
||||
case WUFFS_BASE__PIXEL_FORMAT__RGB:
|
||||
case WUFFS_BASE__PIXEL_FORMAT__RGBA_NONPREMUL:
|
||||
case WUFFS_BASE__PIXEL_FORMAT__RGBA_PREMUL:
|
||||
break;
|
||||
|
||||
@@ -394,6 +394,10 @@ test_wuffs_pixel_swizzler_swizzle() {
|
||||
.color = 0x80000040,
|
||||
.pixfmt_repr = WUFFS_BASE__PIXEL_FORMAT__BGRA_PREMUL,
|
||||
},
|
||||
{
|
||||
.color = 0xFF002233,
|
||||
.pixfmt_repr = WUFFS_BASE__PIXEL_FORMAT__RGB,
|
||||
},
|
||||
{
|
||||
.color = 0x33002233,
|
||||
.pixfmt_repr = WUFFS_BASE__PIXEL_FORMAT__RGBA_NONPREMUL,
|
||||
|
||||
Reference in new issue
Block a user