Add wuffs_base__pixel_buffer__set_interleaved

This commit is contained in:
Nigel Tao committed 2021-04-02 23:15:20 +11:00
1 parent 543ac9af28
commit 163bc2626c
3 files changed
+158 -25

No files matched your search

+72 -7
View File
@@ -4271,12 +4271,16 @@ typedef struct wuffs_base__pixel_buffer__struct {
} private_impl;
#ifdef __cplusplus
inline wuffs_base__status set_interleaved(
const wuffs_base__pixel_config* pixcfg,
wuffs_base__table_u8 primary_memory,
wuffs_base__slice_u8 palette_memory);
inline wuffs_base__status set_from_slice(
const wuffs_base__pixel_config* pixcfg,
wuffs_base__slice_u8 pixbuf_memory);
inline wuffs_base__status set_from_table(
const wuffs_base__pixel_config* pixcfg,
wuffs_base__table_u8 pixbuf_memory);
wuffs_base__table_u8 primary_memory);
inline wuffs_base__slice_u8 palette();
inline wuffs_base__slice_u8 palette_or_else(wuffs_base__slice_u8 fallback);
inline wuffs_base__pixel_format pixel_format() const;
@@ -4305,6 +4309,55 @@ wuffs_base__null_pixel_buffer() {
return ret;
}
static inline wuffs_base__status //
wuffs_base__pixel_buffer__set_interleaved(
wuffs_base__pixel_buffer* pb,
const wuffs_base__pixel_config* pixcfg,
wuffs_base__table_u8 primary_memory,
wuffs_base__slice_u8 palette_memory) {
if (!pb) {
return wuffs_base__make_status(wuffs_base__error__bad_receiver);
}
memset(pb, 0, sizeof(*pb));
if (!pixcfg ||
wuffs_base__pixel_format__is_planar(&pixcfg->private_impl.pixfmt)) {
return wuffs_base__make_status(wuffs_base__error__bad_argument);
}
if (wuffs_base__pixel_format__is_indexed(&pixcfg->private_impl.pixfmt) &&
(palette_memory.len <
WUFFS_BASE__PIXEL_FORMAT__INDEXED__PALETTE_BYTE_LENGTH)) {
return wuffs_base__make_status(
wuffs_base__error__bad_argument_length_too_short);
}
uint32_t bits_per_pixel =
wuffs_base__pixel_format__bits_per_pixel(&pixcfg->private_impl.pixfmt);
if ((bits_per_pixel == 0) || ((bits_per_pixel % 8) != 0)) {
// TODO: support fraction-of-byte pixels, e.g. 1 bit per pixel?
return wuffs_base__make_status(wuffs_base__error__unsupported_option);
}
uint64_t bytes_per_pixel = bits_per_pixel / 8;
uint64_t width_in_bytes =
((uint64_t)pixcfg->private_impl.width) * bytes_per_pixel;
if ((width_in_bytes > primary_memory.width) ||
(pixcfg->private_impl.height > primary_memory.height)) {
return wuffs_base__make_status(wuffs_base__error__bad_argument);
}
pb->pixcfg = *pixcfg;
pb->private_impl.planes[0] = primary_memory;
if (wuffs_base__pixel_format__is_indexed(&pixcfg->private_impl.pixfmt)) {
wuffs_base__table_u8* tab =
&pb->private_impl
.planes[WUFFS_BASE__PIXEL_FORMAT__INDEXED__COLOR_PLANE];
tab->ptr = palette_memory.ptr;
tab->width = WUFFS_BASE__PIXEL_FORMAT__INDEXED__PALETTE_BYTE_LENGTH;
tab->height = 1;
tab->stride = WUFFS_BASE__PIXEL_FORMAT__INDEXED__PALETTE_BYTE_LENGTH;
}
return wuffs_base__make_status(NULL);
}
static inline wuffs_base__status //
wuffs_base__pixel_buffer__set_from_slice(wuffs_base__pixel_buffer* pb,
const wuffs_base__pixel_config* pixcfg,
@@ -4374,15 +4427,18 @@ wuffs_base__pixel_buffer__set_from_slice(wuffs_base__pixel_buffer* pb,
return wuffs_base__make_status(NULL);
}
// Deprecated: does not handle indexed pixel configurations. Use
// wuffs_base__pixel_buffer__set_interleaved instead.
static inline wuffs_base__status //
wuffs_base__pixel_buffer__set_from_table(wuffs_base__pixel_buffer* pb,
const wuffs_base__pixel_config* pixcfg,
wuffs_base__table_u8 pixbuf_memory) {
wuffs_base__table_u8 primary_memory) {
if (!pb) {
return wuffs_base__make_status(wuffs_base__error__bad_receiver);
}
memset(pb, 0, sizeof(*pb));
if (!pixcfg ||
wuffs_base__pixel_format__is_indexed(&pixcfg->private_impl.pixfmt) ||
wuffs_base__pixel_format__is_planar(&pixcfg->private_impl.pixfmt)) {
return wuffs_base__make_status(wuffs_base__error__bad_argument);
}
@@ -4396,13 +4452,13 @@ wuffs_base__pixel_buffer__set_from_table(wuffs_base__pixel_buffer* pb,
uint64_t width_in_bytes =
((uint64_t)pixcfg->private_impl.width) * bytes_per_pixel;
if ((width_in_bytes > pixbuf_memory.width) ||
(pixcfg->private_impl.height > pixbuf_memory.height)) {
if ((width_in_bytes > primary_memory.width) ||
(pixcfg->private_impl.height > primary_memory.height)) {
return wuffs_base__make_status(wuffs_base__error__bad_argument);
}
pb->pixcfg = *pixcfg;
pb->private_impl.planes[0] = pixbuf_memory;
pb->private_impl.planes[0] = primary_memory;
return wuffs_base__make_status(NULL);
}
@@ -4486,6 +4542,15 @@ wuffs_base__pixel_buffer__set_color_u32_fill_rect(
#ifdef __cplusplus
inline wuffs_base__status //
wuffs_base__pixel_buffer::set_interleaved(
const wuffs_base__pixel_config* pixcfg_arg,
wuffs_base__table_u8 primary_memory,
wuffs_base__slice_u8 palette_memory) {
return wuffs_base__pixel_buffer__set_interleaved(
this, pixcfg_arg, primary_memory, palette_memory);
}
inline wuffs_base__status //
wuffs_base__pixel_buffer::set_from_slice(
const wuffs_base__pixel_config* pixcfg_arg,
@@ -4497,9 +4562,9 @@ wuffs_base__pixel_buffer::set_from_slice(
inline wuffs_base__status //
wuffs_base__pixel_buffer::set_from_table(
const wuffs_base__pixel_config* pixcfg_arg,
wuffs_base__table_u8 pixbuf_memory) {
wuffs_base__table_u8 primary_memory) {
return wuffs_base__pixel_buffer__set_from_table(this, pixcfg_arg,
pixbuf_memory);
primary_memory);
}
inline wuffs_base__slice_u8 //