Make image_buffer__update's dirty_palette implicit

This commit is contained in:
Nigel Tao committed 2018-05-24 13:09:02 +10:00
1 parent d07f3c11d2
commit 4466267063
16 files changed
+156 -168

No files matched your search

+10 -11
View File
@@ -1036,9 +1036,9 @@ typedef struct {
uint32_t loop_count; // 0-based count of the current loop.
wuffs_base__pixel_buffer pixbuf;
// TODO: color spaces.
bool dirty_palette;
wuffs_base__rect_ie_u32 dirty_rect;
wuffs_base__flicks duration;
bool palette_changed;
uint8_t palette[1024];
} private_impl;
} wuffs_base__image_buffer;
@@ -1078,16 +1078,15 @@ static inline void wuffs_base__image_buffer__set_from_slice(
tab->stride = config.private_impl.width;
}
// The palette argument is ignored unless its length is exactly 1024.
static inline void wuffs_base__image_buffer__update(
wuffs_base__image_buffer* b,
bool dirty_palette,
wuffs_base__rect_ie_u32 dirty_rect,
wuffs_base__flicks duration,
wuffs_base__slice_u8 palette) {
if (!b) {
return;
}
b->private_impl.dirty_palette = dirty_palette;
// Clip the dirty_rect to the image bounds.
dirty_rect.max_exclusive_x = wuffs_base__u32__min(
@@ -1097,9 +1096,9 @@ static inline void wuffs_base__image_buffer__update(
b->private_impl.dirty_rect = dirty_rect;
b->private_impl.duration = duration;
if (palette.ptr) {
memmove(b->private_impl.palette, palette.ptr,
palette.len <= 1024 ? palette.len : 1024);
b->private_impl.palette_changed = palette.ptr && (palette.len == 1024);
if (b->private_impl.palette_changed) {
memmove(b->private_impl.palette, palette.ptr, 1024);
}
}
@@ -1122,12 +1121,12 @@ static inline bool wuffs_base__image_buffer__loop(wuffs_base__image_buffer* b) {
return false;
}
// wuffs_base__image_buffer__dirty_palette returns whether this frame's palette
// differs from the previous frame. It is conservative and may return false
// positives (but never false negatives).
static inline bool wuffs_base__image_buffer__dirty_palette(
// wuffs_base__image_buffer__palette_changed returns whether this frame's
// palette differs from the previous frame. It is conservative and may return
// false positives (but never false negatives).
static inline bool wuffs_base__image_buffer__palette_changed(
wuffs_base__image_buffer* b) {
return b && b->private_impl.dirty_palette;
return b && b->private_impl.palette_changed;
}
// wuffs_base__image_buffer__dirty_rect returns an upper bound for what part of
+5 -5
View File
@@ -78,11 +78,11 @@ const baseHeader = "" +
"l.num_loops = num_loops;\n return;\n }\n }\n *c = ((wuffs_base__image_config){});\n}\n\nstatic inline void wuffs_base__image_config__invalidate(\n wuffs_base__image_config* c) {\n if (c) {\n *c = ((wuffs_base__image_config){});\n }\n}\n\nstatic inline bool wuffs_base__image_config__is_valid(\n wuffs_base__image_config* c) {\n return c && c->private_impl.pixfmt;\n}\n\nstatic inline wuffs_base__pixel_format wuffs_base__image_config__pixel_format(\n wuffs_base__image_config* c) {\n return c ? c->private_impl.pixfmt : 0;\n}\n\nstatic inline wuffs_base__pixel_subsampling\nwuffs_base__image_config__pixel_subsampling(wuffs_base__image_config* c) {\n return c ? c->private_impl.pixsub : 0;\n}\n\nstatic inline uint32_t wuffs_base__image_config__width(\n wuffs_base__image_config* c) {\n return c ? c->private_impl.width : 0;\n}\n\nstatic inline uint32_t wuffs_base__image_config__height(\n wuffs_base__image_config* c) {\n return c ? c->private_impl.height : 0;\n}\n\nstatic inline uint32_t wuffs_base__image_config__num_loops(\n" +
" wuffs_base__image_config* c) {\n return c ? c->private_impl.num_loops : 0;\n}\n\n// TODO: this is the right API for planar (not packed) pixbufs? Should it allow\n// decoding into a color model different from the format's intrinsic one? For\n// example, decoding a JPEG image straight to RGBA instead of to YCbCr?\nstatic inline size_t wuffs_base__image_config__pixbuf_size(\n wuffs_base__image_config* c) {\n if (c) {\n uint64_t wh =\n ((uint64_t)c->private_impl.width) * ((uint64_t)c->private_impl.height);\n // TODO: handle things other than 1 byte per pixel.\n return (size_t)wh;\n }\n return 0;\n}\n\n" +
"" +
"// --------\n\ntypedef struct {\n // Do not access the private_impl's fields directly. There is no API/ABI\n // compatibility or safety guarantee if you do so.\n struct {\n wuffs_base__image_config config;\n uint32_t loop_count; // 0-based count of the current loop.\n wuffs_base__pixel_buffer pixbuf;\n // TODO: color spaces.\n bool dirty_palette;\n wuffs_base__rect_ie_u32 dirty_rect;\n wuffs_base__flicks duration;\n uint8_t palette[1024];\n } private_impl;\n} wuffs_base__image_buffer;\n\nstatic inline void wuffs_base__image_buffer__set_from_pixbuf(\n wuffs_base__image_buffer* b,\n wuffs_base__image_config config,\n wuffs_base__pixel_buffer pixbuf) {\n if (!b) {\n return;\n }\n *b = ((wuffs_base__image_buffer){});\n b->private_impl.config = config;\n b->private_impl.pixbuf = pixbuf;\n}\n\n// TODO: Should this function return bool? An error type?\nstatic inline void wuffs_base__image_buffer__set_from_slice(\n wuffs_base__image_buffer* b,\n wuffs_base__image_config config,\n wuffs_base__sli" +
"ce_u8 pixbuf_memory) {\n if (!b) {\n return;\n }\n *b = ((wuffs_base__image_buffer){});\n // TODO: don't assume 1 byte per pixel. Don't assume packed.\n uint64_t wh = ((uint64_t)config.private_impl.width) *\n ((uint64_t)config.private_impl.height);\n if (wh > pixbuf_memory.len) {\n return;\n }\n b->private_impl.config = config;\n wuffs_base__table_u8* tab = &b->private_impl.pixbuf.planes[0];\n tab->ptr = pixbuf_memory.ptr;\n tab->width = config.private_impl.width;\n tab->height = config.private_impl.height;\n tab->stride = config.private_impl.width;\n}\n\nstatic inline void wuffs_base__image_buffer__update(\n wuffs_base__image_buffer* b,\n bool dirty_palette,\n wuffs_base__rect_ie_u32 dirty_rect,\n wuffs_base__flicks duration,\n wuffs_base__slice_u8 palette) {\n if (!b) {\n return;\n }\n b->private_impl.dirty_palette = dirty_palette;\n\n // Clip the dirty_rect to the image bounds.\n dirty_rect.max_exclusive_x = wuffs_base__u32__min(\n dirty_rect.max_exclusive_x, b->private_impl.c" +
"onfig.private_impl.width);\n dirty_rect.max_exclusive_y = wuffs_base__u32__min(\n dirty_rect.max_exclusive_y, b->private_impl.config.private_impl.width);\n b->private_impl.dirty_rect = dirty_rect;\n\n b->private_impl.duration = duration;\n if (palette.ptr) {\n memmove(b->private_impl.palette, palette.ptr,\n palette.len <= 1024 ? palette.len : 1024);\n }\n}\n\n// wuffs_base__image_buffer__loop returns whether the image decoder should loop\n// back to the beginning of the animation, assuming that we've reached the end\n// of the encoded stream. If so, it increments b's count of the animation loops\n// played so far.\nstatic inline bool wuffs_base__image_buffer__loop(wuffs_base__image_buffer* b) {\n if (!b) {\n return false;\n }\n uint32_t n = b->private_impl.config.private_impl.num_loops;\n if (n == 0) {\n return true;\n }\n if (b->private_impl.loop_count < n - 1) {\n b->private_impl.loop_count++;\n return true;\n }\n return false;\n}\n\n// wuffs_base__image_buffer__dirty_palette returns whether th" +
"is frame's palette\n// differs from the previous frame. It is conservative and may return false\n// positives (but never false negatives).\nstatic inline bool wuffs_base__image_buffer__dirty_palette(\n wuffs_base__image_buffer* b) {\n return b && b->private_impl.dirty_palette;\n}\n\n// wuffs_base__image_buffer__dirty_rect returns an upper bound for what part of\n// this frame's pixels differs from the previous frame.\nstatic inline wuffs_base__rect_ie_u32 wuffs_base__image_buffer__dirty_rect(\n wuffs_base__image_buffer* b) {\n return b ? b->private_impl.dirty_rect : ((wuffs_base__rect_ie_u32){0});\n}\n\n// wuffs_base__image_buffer__duration returns the amount of time to display\n// this frame. Zero means to display forever - a still (non-animated) image.\nstatic inline wuffs_base__flicks wuffs_base__image_buffer__duration(\n wuffs_base__image_buffer* b) {\n return b ? b->private_impl.duration : 0;\n}\n\n// wuffs_base__image_buffer__palette returns the palette that the pixel data\n// can index. The backing array is insid" +
"e b and has length 1024.\nstatic inline uint8_t* wuffs_base__image_buffer__palette(\n wuffs_base__image_buffer* b) {\n return b ? b->private_impl.palette : NULL;\n}\n\nstatic inline wuffs_base__table_u8 wuffs_base__image_buffer__plane(\n wuffs_base__image_buffer* b,\n uint32_t p) {\n return (b && (p < WUFFS_BASE__PIXEL_FORMAT__NUM_PLANES_MAX))\n ? b->private_impl.pixbuf.planes[p]\n : ((wuffs_base__table_u8){});\n}\n\n#endif // WUFFS_BASE_HEADER_H\n" +
"// --------\n\ntypedef struct {\n // Do not access the private_impl's fields directly. There is no API/ABI\n // compatibility or safety guarantee if you do so.\n struct {\n wuffs_base__image_config config;\n uint32_t loop_count; // 0-based count of the current loop.\n wuffs_base__pixel_buffer pixbuf;\n // TODO: color spaces.\n wuffs_base__rect_ie_u32 dirty_rect;\n wuffs_base__flicks duration;\n bool palette_changed;\n uint8_t palette[1024];\n } private_impl;\n} wuffs_base__image_buffer;\n\nstatic inline void wuffs_base__image_buffer__set_from_pixbuf(\n wuffs_base__image_buffer* b,\n wuffs_base__image_config config,\n wuffs_base__pixel_buffer pixbuf) {\n if (!b) {\n return;\n }\n *b = ((wuffs_base__image_buffer){});\n b->private_impl.config = config;\n b->private_impl.pixbuf = pixbuf;\n}\n\n// TODO: Should this function return bool? An error type?\nstatic inline void wuffs_base__image_buffer__set_from_slice(\n wuffs_base__image_buffer* b,\n wuffs_base__image_config config,\n wuffs_base__s" +
"lice_u8 pixbuf_memory) {\n if (!b) {\n return;\n }\n *b = ((wuffs_base__image_buffer){});\n // TODO: don't assume 1 byte per pixel. Don't assume packed.\n uint64_t wh = ((uint64_t)config.private_impl.width) *\n ((uint64_t)config.private_impl.height);\n if (wh > pixbuf_memory.len) {\n return;\n }\n b->private_impl.config = config;\n wuffs_base__table_u8* tab = &b->private_impl.pixbuf.planes[0];\n tab->ptr = pixbuf_memory.ptr;\n tab->width = config.private_impl.width;\n tab->height = config.private_impl.height;\n tab->stride = config.private_impl.width;\n}\n\n// The palette argument is ignored unless its length is exactly 1024.\nstatic inline void wuffs_base__image_buffer__update(\n wuffs_base__image_buffer* b,\n wuffs_base__rect_ie_u32 dirty_rect,\n wuffs_base__flicks duration,\n wuffs_base__slice_u8 palette) {\n if (!b) {\n return;\n }\n\n // Clip the dirty_rect to the image bounds.\n dirty_rect.max_exclusive_x = wuffs_base__u32__min(\n dirty_rect.max_exclusive_x, b->private_impl.co" +
"nfig.private_impl.width);\n dirty_rect.max_exclusive_y = wuffs_base__u32__min(\n dirty_rect.max_exclusive_y, b->private_impl.config.private_impl.width);\n b->private_impl.dirty_rect = dirty_rect;\n\n b->private_impl.duration = duration;\n b->private_impl.palette_changed = palette.ptr && (palette.len == 1024);\n if (b->private_impl.palette_changed) {\n memmove(b->private_impl.palette, palette.ptr, 1024);\n }\n}\n\n// wuffs_base__image_buffer__loop returns whether the image decoder should loop\n// back to the beginning of the animation, assuming that we've reached the end\n// of the encoded stream. If so, it increments b's count of the animation loops\n// played so far.\nstatic inline bool wuffs_base__image_buffer__loop(wuffs_base__image_buffer* b) {\n if (!b) {\n return false;\n }\n uint32_t n = b->private_impl.config.private_impl.num_loops;\n if (n == 0) {\n return true;\n }\n if (b->private_impl.loop_count < n - 1) {\n b->private_impl.loop_count++;\n return true;\n }\n return false;\n}\n\n// wuffs_base__i" +
"mage_buffer__palette_changed returns whether this frame's\n// palette differs from the previous frame. It is conservative and may return\n// false positives (but never false negatives).\nstatic inline bool wuffs_base__image_buffer__palette_changed(\n wuffs_base__image_buffer* b) {\n return b && b->private_impl.palette_changed;\n}\n\n// wuffs_base__image_buffer__dirty_rect returns an upper bound for what part of\n// this frame's pixels differs from the previous frame.\nstatic inline wuffs_base__rect_ie_u32 wuffs_base__image_buffer__dirty_rect(\n wuffs_base__image_buffer* b) {\n return b ? b->private_impl.dirty_rect : ((wuffs_base__rect_ie_u32){0});\n}\n\n// wuffs_base__image_buffer__duration returns the amount of time to display\n// this frame. Zero means to display forever - a still (non-animated) image.\nstatic inline wuffs_base__flicks wuffs_base__image_buffer__duration(\n wuffs_base__image_buffer* b) {\n return b ? b->private_impl.duration : 0;\n}\n\n// wuffs_base__image_buffer__palette returns the palette that the " +
"pixel data\n// can index. The backing array is inside b and has length 1024.\nstatic inline uint8_t* wuffs_base__image_buffer__palette(\n wuffs_base__image_buffer* b) {\n return b ? b->private_impl.palette : NULL;\n}\n\nstatic inline wuffs_base__table_u8 wuffs_base__image_buffer__plane(\n wuffs_base__image_buffer* b,\n uint32_t p) {\n return (b && (p < WUFFS_BASE__PIXEL_FORMAT__NUM_PLANES_MAX))\n ? b->private_impl.pixbuf.planes[p]\n : ((wuffs_base__table_u8){});\n}\n\n#endif // WUFFS_BASE_HEADER_H\n" +
""
const baseImpl = "" +
+10 -11
View File
@@ -1039,9 +1039,9 @@ typedef struct {
uint32_t loop_count; // 0-based count of the current loop.
wuffs_base__pixel_buffer pixbuf;
// TODO: color spaces.
bool dirty_palette;
wuffs_base__rect_ie_u32 dirty_rect;
wuffs_base__flicks duration;
bool palette_changed;
uint8_t palette[1024];
} private_impl;
} wuffs_base__image_buffer;
@@ -1081,16 +1081,15 @@ static inline void wuffs_base__image_buffer__set_from_slice(
tab->stride = config.private_impl.width;
}
// The palette argument is ignored unless its length is exactly 1024.
static inline void wuffs_base__image_buffer__update(
wuffs_base__image_buffer* b,
bool dirty_palette,
wuffs_base__rect_ie_u32 dirty_rect,
wuffs_base__flicks duration,
wuffs_base__slice_u8 palette) {
if (!b) {
return;
}
b->private_impl.dirty_palette = dirty_palette;
// Clip the dirty_rect to the image bounds.
dirty_rect.max_exclusive_x = wuffs_base__u32__min(
@@ -1100,9 +1099,9 @@ static inline void wuffs_base__image_buffer__update(
b->private_impl.dirty_rect = dirty_rect;
b->private_impl.duration = duration;
if (palette.ptr) {
memmove(b->private_impl.palette, palette.ptr,
palette.len <= 1024 ? palette.len : 1024);
b->private_impl.palette_changed = palette.ptr && (palette.len == 1024);
if (b->private_impl.palette_changed) {
memmove(b->private_impl.palette, palette.ptr, 1024);
}
}
@@ -1125,12 +1124,12 @@ static inline bool wuffs_base__image_buffer__loop(wuffs_base__image_buffer* b) {
return false;
}
// wuffs_base__image_buffer__dirty_palette returns whether this frame's palette
// differs from the previous frame. It is conservative and may return false
// positives (but never false negatives).
static inline bool wuffs_base__image_buffer__dirty_palette(
// wuffs_base__image_buffer__palette_changed returns whether this frame's
// palette differs from the previous frame. It is conservative and may return
// false positives (but never false negatives).
static inline bool wuffs_base__image_buffer__palette_changed(
wuffs_base__image_buffer* b) {
return b && b->private_impl.dirty_palette;
return b && b->private_impl.palette_changed;
}
// wuffs_base__image_buffer__dirty_rect returns an upper bound for what part of
+10 -11
View File
@@ -1039,9 +1039,9 @@ typedef struct {
uint32_t loop_count; // 0-based count of the current loop.
wuffs_base__pixel_buffer pixbuf;
// TODO: color spaces.
bool dirty_palette;
wuffs_base__rect_ie_u32 dirty_rect;
wuffs_base__flicks duration;
bool palette_changed;
uint8_t palette[1024];
} private_impl;
} wuffs_base__image_buffer;
@@ -1081,16 +1081,15 @@ static inline void wuffs_base__image_buffer__set_from_slice(
tab->stride = config.private_impl.width;
}
// The palette argument is ignored unless its length is exactly 1024.
static inline void wuffs_base__image_buffer__update(
wuffs_base__image_buffer* b,
bool dirty_palette,
wuffs_base__rect_ie_u32 dirty_rect,
wuffs_base__flicks duration,
wuffs_base__slice_u8 palette) {
if (!b) {
return;
}
b->private_impl.dirty_palette = dirty_palette;
// Clip the dirty_rect to the image bounds.
dirty_rect.max_exclusive_x = wuffs_base__u32__min(
@@ -1100,9 +1099,9 @@ static inline void wuffs_base__image_buffer__update(
b->private_impl.dirty_rect = dirty_rect;
b->private_impl.duration = duration;
if (palette.ptr) {
memmove(b->private_impl.palette, palette.ptr,
palette.len <= 1024 ? palette.len : 1024);
b->private_impl.palette_changed = palette.ptr && (palette.len == 1024);
if (b->private_impl.palette_changed) {
memmove(b->private_impl.palette, palette.ptr, 1024);
}
}
@@ -1125,12 +1124,12 @@ static inline bool wuffs_base__image_buffer__loop(wuffs_base__image_buffer* b) {
return false;
}
// wuffs_base__image_buffer__dirty_palette returns whether this frame's palette
// differs from the previous frame. It is conservative and may return false
// positives (but never false negatives).
static inline bool wuffs_base__image_buffer__dirty_palette(
// wuffs_base__image_buffer__palette_changed returns whether this frame's
// palette differs from the previous frame. It is conservative and may return
// false positives (but never false negatives).
static inline bool wuffs_base__image_buffer__palette_changed(
wuffs_base__image_buffer* b) {
return b && b->private_impl.dirty_palette;
return b && b->private_impl.palette_changed;
}
// wuffs_base__image_buffer__dirty_rect returns an upper bound for what part of
+10 -11
View File
@@ -1039,9 +1039,9 @@ typedef struct {
uint32_t loop_count; // 0-based count of the current loop.
wuffs_base__pixel_buffer pixbuf;
// TODO: color spaces.
bool dirty_palette;
wuffs_base__rect_ie_u32 dirty_rect;
wuffs_base__flicks duration;
bool palette_changed;
uint8_t palette[1024];
} private_impl;
} wuffs_base__image_buffer;
@@ -1081,16 +1081,15 @@ static inline void wuffs_base__image_buffer__set_from_slice(
tab->stride = config.private_impl.width;
}
// The palette argument is ignored unless its length is exactly 1024.
static inline void wuffs_base__image_buffer__update(
wuffs_base__image_buffer* b,
bool dirty_palette,
wuffs_base__rect_ie_u32 dirty_rect,
wuffs_base__flicks duration,
wuffs_base__slice_u8 palette) {
if (!b) {
return;
}
b->private_impl.dirty_palette = dirty_palette;
// Clip the dirty_rect to the image bounds.
dirty_rect.max_exclusive_x = wuffs_base__u32__min(
@@ -1100,9 +1099,9 @@ static inline void wuffs_base__image_buffer__update(
b->private_impl.dirty_rect = dirty_rect;
b->private_impl.duration = duration;
if (palette.ptr) {
memmove(b->private_impl.palette, palette.ptr,
palette.len <= 1024 ? palette.len : 1024);
b->private_impl.palette_changed = palette.ptr && (palette.len == 1024);
if (b->private_impl.palette_changed) {
memmove(b->private_impl.palette, palette.ptr, 1024);
}
}
@@ -1125,12 +1124,12 @@ static inline bool wuffs_base__image_buffer__loop(wuffs_base__image_buffer* b) {
return false;
}
// wuffs_base__image_buffer__dirty_palette returns whether this frame's palette
// differs from the previous frame. It is conservative and may return false
// positives (but never false negatives).
static inline bool wuffs_base__image_buffer__dirty_palette(
// wuffs_base__image_buffer__palette_changed returns whether this frame's
// palette differs from the previous frame. It is conservative and may return
// false positives (but never false negatives).
static inline bool wuffs_base__image_buffer__palette_changed(
wuffs_base__image_buffer* b) {
return b && b->private_impl.dirty_palette;
return b && b->private_impl.palette_changed;
}
// wuffs_base__image_buffer__dirty_rect returns an upper bound for what part of
+21 -24
View File
@@ -1039,9 +1039,9 @@ typedef struct {
uint32_t loop_count; // 0-based count of the current loop.
wuffs_base__pixel_buffer pixbuf;
// TODO: color spaces.
bool dirty_palette;
wuffs_base__rect_ie_u32 dirty_rect;
wuffs_base__flicks duration;
bool palette_changed;
uint8_t palette[1024];
} private_impl;
} wuffs_base__image_buffer;
@@ -1081,16 +1081,15 @@ static inline void wuffs_base__image_buffer__set_from_slice(
tab->stride = config.private_impl.width;
}
// The palette argument is ignored unless its length is exactly 1024.
static inline void wuffs_base__image_buffer__update(
wuffs_base__image_buffer* b,
bool dirty_palette,
wuffs_base__rect_ie_u32 dirty_rect,
wuffs_base__flicks duration,
wuffs_base__slice_u8 palette) {
if (!b) {
return;
}
b->private_impl.dirty_palette = dirty_palette;
// Clip the dirty_rect to the image bounds.
dirty_rect.max_exclusive_x = wuffs_base__u32__min(
@@ -1100,9 +1099,9 @@ static inline void wuffs_base__image_buffer__update(
b->private_impl.dirty_rect = dirty_rect;
b->private_impl.duration = duration;
if (palette.ptr) {
memmove(b->private_impl.palette, palette.ptr,
palette.len <= 1024 ? palette.len : 1024);
b->private_impl.palette_changed = palette.ptr && (palette.len == 1024);
if (b->private_impl.palette_changed) {
memmove(b->private_impl.palette, palette.ptr, 1024);
}
}
@@ -1125,12 +1124,12 @@ static inline bool wuffs_base__image_buffer__loop(wuffs_base__image_buffer* b) {
return false;
}
// wuffs_base__image_buffer__dirty_palette returns whether this frame's palette
// differs from the previous frame. It is conservative and may return false
// positives (but never false negatives).
static inline bool wuffs_base__image_buffer__dirty_palette(
// wuffs_base__image_buffer__palette_changed returns whether this frame's
// palette differs from the previous frame. It is conservative and may return
// false positives (but never false negatives).
static inline bool wuffs_base__image_buffer__palette_changed(
wuffs_base__image_buffer* b) {
return b && b->private_impl.dirty_palette;
return b && b->private_impl.palette_changed;
}
// wuffs_base__image_buffer__dirty_rect returns an upper bound for what part of
@@ -1333,7 +1332,6 @@ typedef struct {
wuffs_gif__status v_z;
bool v_write_to_ib_instead_of_w;
uint64_t v_n_copied;
uint32_t v_p;
} c_decode_id_part1[1];
} private_impl;
} wuffs_gif__decoder;
@@ -3123,7 +3121,7 @@ static wuffs_gif__status wuffs_gif__decoder__decode_id_part1(
uint64_t v_n_copied;
wuffs_base__table_u8 v_tab;
wuffs_base__slice_u8 v_pixel_data;
uint32_t v_p;
wuffs_base__slice_u8 v_palette;
uint8_t* ioptr_dst = NULL;
uint8_t* iobounds0orig_dst = NULL;
@@ -3178,7 +3176,7 @@ static wuffs_gif__status wuffs_gif__decoder__decode_id_part1(
v_n_copied = self->private_impl.c_decode_id_part1[0].v_n_copied;
v_tab = ((wuffs_base__table_u8){});
v_pixel_data = ((wuffs_base__slice_u8){});
v_p = self->private_impl.c_decode_id_part1[0].v_p;
v_palette = ((wuffs_base__slice_u8){});
} else {
v_use_local_palette = false;
v_w = ((wuffs_base__io_writer){});
@@ -3186,6 +3184,7 @@ static wuffs_gif__status wuffs_gif__decoder__decode_id_part1(
v_pass_through = ((wuffs_base__slice_u8){});
v_tab = ((wuffs_base__table_u8){});
v_pixel_data = ((wuffs_base__slice_u8){});
v_palette = ((wuffs_base__slice_u8){});
}
switch (coro_susp_point) {
WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0;
@@ -3359,17 +3358,16 @@ static wuffs_gif__status wuffs_gif__decoder__decode_id_part1(
label_1_break:;
}
label_0_break:;
v_p = 0;
v_palette = ((wuffs_base__slice_u8){});
if (v_use_local_palette) {
v_p = 1;
v_palette = ((wuffs_base__slice_u8){
.ptr = self->private_impl.f_palettes[1], .len = 1024});
} else if (!self->private_impl.f_previous_use_global_palette) {
v_palette = ((wuffs_base__slice_u8){
.ptr = self->private_impl.f_palettes[0], .len = 1024});
}
wuffs_base__image_buffer__update(
a_ib,
(v_use_local_palette ||
!self->private_impl.f_previous_use_global_palette),
self->private_impl.f_frame_rect, 0,
((wuffs_base__slice_u8){.ptr = self->private_impl.f_palettes[v_p],
.len = 1024}));
wuffs_base__image_buffer__update(a_ib, self->private_impl.f_frame_rect, 0,
v_palette);
self->private_impl.f_previous_use_global_palette = !v_use_local_palette;
goto ok;
@@ -3393,7 +3391,6 @@ suspend:
self->private_impl.c_decode_id_part1[0].v_write_to_ib_instead_of_w =
v_write_to_ib_instead_of_w;
self->private_impl.c_decode_id_part1[0].v_n_copied = v_n_copied;
self->private_impl.c_decode_id_part1[0].v_p = v_p;
goto exit;
exit:
+10 -11
View File
@@ -1039,9 +1039,9 @@ typedef struct {
uint32_t loop_count; // 0-based count of the current loop.
wuffs_base__pixel_buffer pixbuf;
// TODO: color spaces.
bool dirty_palette;
wuffs_base__rect_ie_u32 dirty_rect;
wuffs_base__flicks duration;
bool palette_changed;
uint8_t palette[1024];
} private_impl;
} wuffs_base__image_buffer;
@@ -1081,16 +1081,15 @@ static inline void wuffs_base__image_buffer__set_from_slice(
tab->stride = config.private_impl.width;
}
// The palette argument is ignored unless its length is exactly 1024.
static inline void wuffs_base__image_buffer__update(
wuffs_base__image_buffer* b,
bool dirty_palette,
wuffs_base__rect_ie_u32 dirty_rect,
wuffs_base__flicks duration,
wuffs_base__slice_u8 palette) {
if (!b) {
return;
}
b->private_impl.dirty_palette = dirty_palette;
// Clip the dirty_rect to the image bounds.
dirty_rect.max_exclusive_x = wuffs_base__u32__min(
@@ -1100,9 +1099,9 @@ static inline void wuffs_base__image_buffer__update(
b->private_impl.dirty_rect = dirty_rect;
b->private_impl.duration = duration;
if (palette.ptr) {
memmove(b->private_impl.palette, palette.ptr,
palette.len <= 1024 ? palette.len : 1024);
b->private_impl.palette_changed = palette.ptr && (palette.len == 1024);
if (b->private_impl.palette_changed) {
memmove(b->private_impl.palette, palette.ptr, 1024);
}
}
@@ -1125,12 +1124,12 @@ static inline bool wuffs_base__image_buffer__loop(wuffs_base__image_buffer* b) {
return false;
}
// wuffs_base__image_buffer__dirty_palette returns whether this frame's palette
// differs from the previous frame. It is conservative and may return false
// positives (but never false negatives).
static inline bool wuffs_base__image_buffer__dirty_palette(
// wuffs_base__image_buffer__palette_changed returns whether this frame's
// palette differs from the previous frame. It is conservative and may return
// false positives (but never false negatives).
static inline bool wuffs_base__image_buffer__palette_changed(
wuffs_base__image_buffer* b) {
return b && b->private_impl.dirty_palette;
return b && b->private_impl.palette_changed;
}
// wuffs_base__image_buffer__dirty_rect returns an upper bound for what part of
+10 -11
View File
@@ -1039,9 +1039,9 @@ typedef struct {
uint32_t loop_count; // 0-based count of the current loop.
wuffs_base__pixel_buffer pixbuf;
// TODO: color spaces.
bool dirty_palette;
wuffs_base__rect_ie_u32 dirty_rect;
wuffs_base__flicks duration;
bool palette_changed;
uint8_t palette[1024];
} private_impl;
} wuffs_base__image_buffer;
@@ -1081,16 +1081,15 @@ static inline void wuffs_base__image_buffer__set_from_slice(
tab->stride = config.private_impl.width;
}
// The palette argument is ignored unless its length is exactly 1024.
static inline void wuffs_base__image_buffer__update(
wuffs_base__image_buffer* b,
bool dirty_palette,
wuffs_base__rect_ie_u32 dirty_rect,
wuffs_base__flicks duration,
wuffs_base__slice_u8 palette) {
if (!b) {
return;
}
b->private_impl.dirty_palette = dirty_palette;
// Clip the dirty_rect to the image bounds.
dirty_rect.max_exclusive_x = wuffs_base__u32__min(
@@ -1100,9 +1099,9 @@ static inline void wuffs_base__image_buffer__update(
b->private_impl.dirty_rect = dirty_rect;
b->private_impl.duration = duration;
if (palette.ptr) {
memmove(b->private_impl.palette, palette.ptr,
palette.len <= 1024 ? palette.len : 1024);
b->private_impl.palette_changed = palette.ptr && (palette.len == 1024);
if (b->private_impl.palette_changed) {
memmove(b->private_impl.palette, palette.ptr, 1024);
}
}
@@ -1125,12 +1124,12 @@ static inline bool wuffs_base__image_buffer__loop(wuffs_base__image_buffer* b) {
return false;
}
// wuffs_base__image_buffer__dirty_palette returns whether this frame's palette
// differs from the previous frame. It is conservative and may return false
// positives (but never false negatives).
static inline bool wuffs_base__image_buffer__dirty_palette(
// wuffs_base__image_buffer__palette_changed returns whether this frame's
// palette differs from the previous frame. It is conservative and may return
// false positives (but never false negatives).
static inline bool wuffs_base__image_buffer__palette_changed(
wuffs_base__image_buffer* b) {
return b && b->private_impl.dirty_palette;
return b && b->private_impl.palette_changed;
}
// wuffs_base__image_buffer__dirty_rect returns an upper bound for what part of
+10 -11
View File
@@ -1039,9 +1039,9 @@ typedef struct {
uint32_t loop_count; // 0-based count of the current loop.
wuffs_base__pixel_buffer pixbuf;
// TODO: color spaces.
bool dirty_palette;
wuffs_base__rect_ie_u32 dirty_rect;
wuffs_base__flicks duration;
bool palette_changed;
uint8_t palette[1024];
} private_impl;
} wuffs_base__image_buffer;
@@ -1081,16 +1081,15 @@ static inline void wuffs_base__image_buffer__set_from_slice(
tab->stride = config.private_impl.width;
}
// The palette argument is ignored unless its length is exactly 1024.
static inline void wuffs_base__image_buffer__update(
wuffs_base__image_buffer* b,
bool dirty_palette,
wuffs_base__rect_ie_u32 dirty_rect,
wuffs_base__flicks duration,
wuffs_base__slice_u8 palette) {
if (!b) {
return;
}
b->private_impl.dirty_palette = dirty_palette;
// Clip the dirty_rect to the image bounds.
dirty_rect.max_exclusive_x = wuffs_base__u32__min(
@@ -1100,9 +1099,9 @@ static inline void wuffs_base__image_buffer__update(
b->private_impl.dirty_rect = dirty_rect;
b->private_impl.duration = duration;
if (palette.ptr) {
memmove(b->private_impl.palette, palette.ptr,
palette.len <= 1024 ? palette.len : 1024);
b->private_impl.palette_changed = palette.ptr && (palette.len == 1024);
if (b->private_impl.palette_changed) {
memmove(b->private_impl.palette, palette.ptr, 1024);
}
}
@@ -1125,12 +1124,12 @@ static inline bool wuffs_base__image_buffer__loop(wuffs_base__image_buffer* b) {
return false;
}
// wuffs_base__image_buffer__dirty_palette returns whether this frame's palette
// differs from the previous frame. It is conservative and may return false
// positives (but never false negatives).
static inline bool wuffs_base__image_buffer__dirty_palette(
// wuffs_base__image_buffer__palette_changed returns whether this frame's
// palette differs from the previous frame. It is conservative and may return
// false positives (but never false negatives).
static inline bool wuffs_base__image_buffer__palette_changed(
wuffs_base__image_buffer* b) {
return b && b->private_impl.dirty_palette;
return b && b->private_impl.palette_changed;
}
// wuffs_base__image_buffer__dirty_rect returns an upper bound for what part of
+10 -11
View File
@@ -1039,9 +1039,9 @@ typedef struct {
uint32_t loop_count; // 0-based count of the current loop.
wuffs_base__pixel_buffer pixbuf;
// TODO: color spaces.
bool dirty_palette;
wuffs_base__rect_ie_u32 dirty_rect;
wuffs_base__flicks duration;
bool palette_changed;
uint8_t palette[1024];
} private_impl;
} wuffs_base__image_buffer;
@@ -1081,16 +1081,15 @@ static inline void wuffs_base__image_buffer__set_from_slice(
tab->stride = config.private_impl.width;
}
// The palette argument is ignored unless its length is exactly 1024.
static inline void wuffs_base__image_buffer__update(
wuffs_base__image_buffer* b,
bool dirty_palette,
wuffs_base__rect_ie_u32 dirty_rect,
wuffs_base__flicks duration,
wuffs_base__slice_u8 palette) {
if (!b) {
return;
}
b->private_impl.dirty_palette = dirty_palette;
// Clip the dirty_rect to the image bounds.
dirty_rect.max_exclusive_x = wuffs_base__u32__min(
@@ -1100,9 +1099,9 @@ static inline void wuffs_base__image_buffer__update(
b->private_impl.dirty_rect = dirty_rect;
b->private_impl.duration = duration;
if (palette.ptr) {
memmove(b->private_impl.palette, palette.ptr,
palette.len <= 1024 ? palette.len : 1024);
b->private_impl.palette_changed = palette.ptr && (palette.len == 1024);
if (b->private_impl.palette_changed) {
memmove(b->private_impl.palette, palette.ptr, 1024);
}
}
@@ -1125,12 +1124,12 @@ static inline bool wuffs_base__image_buffer__loop(wuffs_base__image_buffer* b) {
return false;
}
// wuffs_base__image_buffer__dirty_palette returns whether this frame's palette
// differs from the previous frame. It is conservative and may return false
// positives (but never false negatives).
static inline bool wuffs_base__image_buffer__dirty_palette(
// wuffs_base__image_buffer__palette_changed returns whether this frame's
// palette differs from the previous frame. It is conservative and may return
// false positives (but never false negatives).
static inline bool wuffs_base__image_buffer__palette_changed(
wuffs_base__image_buffer* b) {
return b && b->private_impl.dirty_palette;
return b && b->private_impl.palette_changed;
}
// wuffs_base__image_buffer__dirty_rect returns an upper bound for what part of
+10 -11
View File
@@ -1039,9 +1039,9 @@ typedef struct {
uint32_t loop_count; // 0-based count of the current loop.
wuffs_base__pixel_buffer pixbuf;
// TODO: color spaces.
bool dirty_palette;
wuffs_base__rect_ie_u32 dirty_rect;
wuffs_base__flicks duration;
bool palette_changed;
uint8_t palette[1024];
} private_impl;
} wuffs_base__image_buffer;
@@ -1081,16 +1081,15 @@ static inline void wuffs_base__image_buffer__set_from_slice(
tab->stride = config.private_impl.width;
}
// The palette argument is ignored unless its length is exactly 1024.
static inline void wuffs_base__image_buffer__update(
wuffs_base__image_buffer* b,
bool dirty_palette,
wuffs_base__rect_ie_u32 dirty_rect,
wuffs_base__flicks duration,
wuffs_base__slice_u8 palette) {
if (!b) {
return;
}
b->private_impl.dirty_palette = dirty_palette;
// Clip the dirty_rect to the image bounds.
dirty_rect.max_exclusive_x = wuffs_base__u32__min(
@@ -1100,9 +1099,9 @@ static inline void wuffs_base__image_buffer__update(
b->private_impl.dirty_rect = dirty_rect;
b->private_impl.duration = duration;
if (palette.ptr) {
memmove(b->private_impl.palette, palette.ptr,
palette.len <= 1024 ? palette.len : 1024);
b->private_impl.palette_changed = palette.ptr && (palette.len == 1024);
if (b->private_impl.palette_changed) {
memmove(b->private_impl.palette, palette.ptr, 1024);
}
}
@@ -1125,12 +1124,12 @@ static inline bool wuffs_base__image_buffer__loop(wuffs_base__image_buffer* b) {
return false;
}
// wuffs_base__image_buffer__dirty_palette returns whether this frame's palette
// differs from the previous frame. It is conservative and may return false
// positives (but never false negatives).
static inline bool wuffs_base__image_buffer__dirty_palette(
// wuffs_base__image_buffer__palette_changed returns whether this frame's
// palette differs from the previous frame. It is conservative and may return
// false positives (but never false negatives).
static inline bool wuffs_base__image_buffer__palette_changed(
wuffs_base__image_buffer* b) {
return b && b->private_impl.dirty_palette;
return b && b->private_impl.palette_changed;
}
// wuffs_base__image_buffer__dirty_rect returns an upper bound for what part of
+10 -12
View File
@@ -1039,9 +1039,9 @@ typedef struct {
uint32_t loop_count; // 0-based count of the current loop.
wuffs_base__pixel_buffer pixbuf;
// TODO: color spaces.
bool dirty_palette;
wuffs_base__rect_ie_u32 dirty_rect;
wuffs_base__flicks duration;
bool palette_changed;
uint8_t palette[1024];
} private_impl;
} wuffs_base__image_buffer;
@@ -1081,16 +1081,15 @@ static inline void wuffs_base__image_buffer__set_from_slice(
tab->stride = config.private_impl.width;
}
// The palette argument is ignored unless its length is exactly 1024.
static inline void wuffs_base__image_buffer__update(
wuffs_base__image_buffer* b,
bool dirty_palette,
wuffs_base__rect_ie_u32 dirty_rect,
wuffs_base__flicks duration,
wuffs_base__slice_u8 palette) {
if (!b) {
return;
}
b->private_impl.dirty_palette = dirty_palette;
// Clip the dirty_rect to the image bounds.
dirty_rect.max_exclusive_x = wuffs_base__u32__min(
@@ -1100,9 +1099,9 @@ static inline void wuffs_base__image_buffer__update(
b->private_impl.dirty_rect = dirty_rect;
b->private_impl.duration = duration;
if (palette.ptr) {
memmove(b->private_impl.palette, palette.ptr,
palette.len <= 1024 ? palette.len : 1024);
b->private_impl.palette_changed = palette.ptr && (palette.len == 1024);
if (b->private_impl.palette_changed) {
memmove(b->private_impl.palette, palette.ptr, 1024);
}
}
@@ -1125,12 +1124,12 @@ static inline bool wuffs_base__image_buffer__loop(wuffs_base__image_buffer* b) {
return false;
}
// wuffs_base__image_buffer__dirty_palette returns whether this frame's palette
// differs from the previous frame. It is conservative and may return false
// positives (but never false negatives).
static inline bool wuffs_base__image_buffer__dirty_palette(
// wuffs_base__image_buffer__palette_changed returns whether this frame's
// palette differs from the previous frame. It is conservative and may return
// false positives (but never false negatives).
static inline bool wuffs_base__image_buffer__palette_changed(
wuffs_base__image_buffer* b) {
return b && b->private_impl.dirty_palette;
return b && b->private_impl.palette_changed;
}
// wuffs_base__image_buffer__dirty_rect returns an upper bound for what part of
@@ -1333,7 +1332,6 @@ typedef struct {
wuffs_gif__status v_z;
bool v_write_to_ib_instead_of_w;
uint64_t v_n_copied;
uint32_t v_p;
} c_decode_id_part1[1];
} private_impl;
} wuffs_gif__decoder;
+10 -11
View File
@@ -1039,9 +1039,9 @@ typedef struct {
uint32_t loop_count; // 0-based count of the current loop.
wuffs_base__pixel_buffer pixbuf;
// TODO: color spaces.
bool dirty_palette;
wuffs_base__rect_ie_u32 dirty_rect;
wuffs_base__flicks duration;
bool palette_changed;
uint8_t palette[1024];
} private_impl;
} wuffs_base__image_buffer;
@@ -1081,16 +1081,15 @@ static inline void wuffs_base__image_buffer__set_from_slice(
tab->stride = config.private_impl.width;
}
// The palette argument is ignored unless its length is exactly 1024.
static inline void wuffs_base__image_buffer__update(
wuffs_base__image_buffer* b,
bool dirty_palette,
wuffs_base__rect_ie_u32 dirty_rect,
wuffs_base__flicks duration,
wuffs_base__slice_u8 palette) {
if (!b) {
return;
}
b->private_impl.dirty_palette = dirty_palette;
// Clip the dirty_rect to the image bounds.
dirty_rect.max_exclusive_x = wuffs_base__u32__min(
@@ -1100,9 +1099,9 @@ static inline void wuffs_base__image_buffer__update(
b->private_impl.dirty_rect = dirty_rect;
b->private_impl.duration = duration;
if (palette.ptr) {
memmove(b->private_impl.palette, palette.ptr,
palette.len <= 1024 ? palette.len : 1024);
b->private_impl.palette_changed = palette.ptr && (palette.len == 1024);
if (b->private_impl.palette_changed) {
memmove(b->private_impl.palette, palette.ptr, 1024);
}
}
@@ -1125,12 +1124,12 @@ static inline bool wuffs_base__image_buffer__loop(wuffs_base__image_buffer* b) {
return false;
}
// wuffs_base__image_buffer__dirty_palette returns whether this frame's palette
// differs from the previous frame. It is conservative and may return false
// positives (but never false negatives).
static inline bool wuffs_base__image_buffer__dirty_palette(
// wuffs_base__image_buffer__palette_changed returns whether this frame's
// palette differs from the previous frame. It is conservative and may return
// false positives (but never false negatives).
static inline bool wuffs_base__image_buffer__palette_changed(
wuffs_base__image_buffer* b) {
return b && b->private_impl.dirty_palette;
return b && b->private_impl.palette_changed;
}
// wuffs_base__image_buffer__dirty_rect returns an upper bound for what part of
+10 -11
View File
@@ -1039,9 +1039,9 @@ typedef struct {
uint32_t loop_count; // 0-based count of the current loop.
wuffs_base__pixel_buffer pixbuf;
// TODO: color spaces.
bool dirty_palette;
wuffs_base__rect_ie_u32 dirty_rect;
wuffs_base__flicks duration;
bool palette_changed;
uint8_t palette[1024];
} private_impl;
} wuffs_base__image_buffer;
@@ -1081,16 +1081,15 @@ static inline void wuffs_base__image_buffer__set_from_slice(
tab->stride = config.private_impl.width;
}
// The palette argument is ignored unless its length is exactly 1024.
static inline void wuffs_base__image_buffer__update(
wuffs_base__image_buffer* b,
bool dirty_palette,
wuffs_base__rect_ie_u32 dirty_rect,
wuffs_base__flicks duration,
wuffs_base__slice_u8 palette) {
if (!b) {
return;
}
b->private_impl.dirty_palette = dirty_palette;
// Clip the dirty_rect to the image bounds.
dirty_rect.max_exclusive_x = wuffs_base__u32__min(
@@ -1100,9 +1099,9 @@ static inline void wuffs_base__image_buffer__update(
b->private_impl.dirty_rect = dirty_rect;
b->private_impl.duration = duration;
if (palette.ptr) {
memmove(b->private_impl.palette, palette.ptr,
palette.len <= 1024 ? palette.len : 1024);
b->private_impl.palette_changed = palette.ptr && (palette.len == 1024);
if (b->private_impl.palette_changed) {
memmove(b->private_impl.palette, palette.ptr, 1024);
}
}
@@ -1125,12 +1124,12 @@ static inline bool wuffs_base__image_buffer__loop(wuffs_base__image_buffer* b) {
return false;
}
// wuffs_base__image_buffer__dirty_palette returns whether this frame's palette
// differs from the previous frame. It is conservative and may return false
// positives (but never false negatives).
static inline bool wuffs_base__image_buffer__dirty_palette(
// wuffs_base__image_buffer__palette_changed returns whether this frame's
// palette differs from the previous frame. It is conservative and may return
// false positives (but never false negatives).
static inline bool wuffs_base__image_buffer__palette_changed(
wuffs_base__image_buffer* b) {
return b && b->private_impl.dirty_palette;
return b && b->private_impl.palette_changed;
}
// wuffs_base__image_buffer__dirty_rect returns an upper bound for what part of
+1 -1
View File
@@ -121,7 +121,7 @@ var Funcs = []string{
// ---- image_buffer
"image_buffer.plane(p u32[..3])(ret table u8)",
"image_buffer.update!(dirty_palette bool, dirty_rect rect_ie_u32, duration u64, palette slice u8)()",
"image_buffer.update!(dirty_rect rect_ie_u32, duration u64, palette slice u8)()",
// ---- image_config
+9 -5
View File
@@ -429,14 +429,18 @@ pri func decoder.decode_id_part1?(ib ptr base.image_buffer, dst base.io_writer,
}
}
// TODO: have a builtin btoi or "b as base.u32"?
var p base.u32[..1] = 0
var palette slice base.u8
if use_local_palette {
p = 1
palette = this.palettes[1][:]
} else if not this.previous_use_global_palette {
// This frame uses the global palette but the previous one didn't.
palette = this.palettes[0][:]
} else {
// Both this frame and the previous one used the global palette. No
// palette update is necessary.
}
// TODO: duration isn't always 0.
in.ib.update!(dirty_palette:use_local_palette or not this.previous_use_global_palette,
dirty_rect:this.frame_rect, duration:0, palette:this.palettes[p][:])
in.ib.update!(dirty_rect:this.frame_rect, duration:0, palette:palette)
this.previous_use_global_palette = not use_local_palette
}