Add image_config.work_buffer_size

This commit is contained in:
Nigel Tao committed 2018-09-02 14:56:53 +10:00
1 parent a3269e160e
commit 8b1e023e6a
9 files changed
+159 -18

No files matched your search

@@ -445,6 +445,7 @@ typedef struct {
// Do not access the private_impl's fields directly. There is no API/ABI
// compatibility or safety guarantee if you do so.
struct {
wuffs_base__range_ii_u64 work_buffer_size;
uint32_t num_loops;
bool first_frame_is_opaque;
} private_impl;
@@ -454,10 +455,13 @@ typedef struct {
wuffs_base__pixel_subsampling pixsub,
uint32_t width,
uint32_t height,
uint64_t work_buffer_size0,
uint64_t work_buffer_size1,
uint32_t num_loops,
bool first_frame_is_opaque);
inline void invalidate();
inline bool is_valid();
inline wuffs_base__range_ii_u64 work_buffer_size();
inline uint32_t num_loops();
inline uint32_t first_frame_is_opaque();
#endif // __cplusplus
@@ -471,6 +475,8 @@ wuffs_base__image_config__initialize(wuffs_base__image_config* c,
wuffs_base__pixel_subsampling pixsub,
uint32_t width,
uint32_t height,
uint64_t work_buffer_size0,
uint64_t work_buffer_size1,
uint32_t num_loops,
bool first_frame_is_opaque) {
if (!c) {
@@ -481,6 +487,8 @@ wuffs_base__image_config__initialize(wuffs_base__image_config* c,
c->pixcfg.private_impl.pixsub = pixsub;
c->pixcfg.private_impl.width = width;
c->pixcfg.private_impl.height = height;
c->private_impl.work_buffer_size.min_incl = work_buffer_size0;
c->private_impl.work_buffer_size.max_incl = work_buffer_size1;
c->private_impl.num_loops = num_loops;
c->private_impl.first_frame_is_opaque = first_frame_is_opaque;
return;
@@ -500,6 +508,11 @@ wuffs_base__image_config__is_valid(wuffs_base__image_config* c) {
return c && wuffs_base__pixel_config__is_valid(&(c->pixcfg));
}
static inline wuffs_base__range_ii_u64 //
wuffs_base__image_config__work_buffer_size(wuffs_base__image_config* c) {
return c ? c->private_impl.work_buffer_size : ((wuffs_base__range_ii_u64){});
}
static inline uint32_t //
wuffs_base__image_config__num_loops(wuffs_base__image_config* c) {
return c ? c->private_impl.num_loops : 0;
@@ -517,9 +530,12 @@ wuffs_base__image_config::initialize(wuffs_base__pixel_format pixfmt,
wuffs_base__pixel_subsampling pixsub,
uint32_t width,
uint32_t height,
uint64_t work_buffer_size0,
uint64_t work_buffer_size1,
uint32_t num_loops,
bool first_frame_is_opaque) {
wuffs_base__image_config__initialize(this, pixfmt, pixsub, width, height,
work_buffer_size0, work_buffer_size1,
num_loops, first_frame_is_opaque);
}
@@ -533,6 +549,11 @@ wuffs_base__image_config::is_valid() {
return wuffs_base__image_config__is_valid(this);
}
inline wuffs_base__range_ii_u64 //
wuffs_base__image_config::work_buffer_size() {
return wuffs_base__image_config__work_buffer_size(this);
}
inline uint32_t //
wuffs_base__image_config::num_loops() {
return wuffs_base__image_config__num_loops(this);
+5 -4
View File
@@ -137,10 +137,11 @@ const baseImagePublicH = "" +
"nt from the format's intrinsic one? For\n// example, decoding a JPEG image straight to RGBA instead of to YCbCr?\nstatic inline size_t //\nwuffs_base__pixel_config__pixbuf_size(wuffs_base__pixel_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#ifdef __cplusplus\n\ninline void //\nwuffs_base__pixel_config::initialize(wuffs_base__pixel_format pixfmt,\n wuffs_base__pixel_subsampling pixsub,\n uint32_t width,\n uint32_t height) {\n wuffs_base__pixel_config__initialize(this, pixfmt, pixsub, width, height);\n}\n\ninline void //\nwuffs_base__pixel_config::invalidate() {\n wuffs_base__pixel_config__invalidate(this);\n}\n\ninline bool //\nwuffs_base__pixel_config::is_valid() {\n return wuffs_base__pixel_config__is_valid(this);\n}\n\ninline wuffs_base__pixel_f" +
"ormat //\nwuffs_base__pixel_config::pixel_format() {\n return wuffs_base__pixel_config__pixel_format(this);\n}\n\ninline wuffs_base__pixel_subsampling //\nwuffs_base__pixel_config::pixel_subsampling() {\n return wuffs_base__pixel_config__pixel_subsampling(this);\n}\n\ninline wuffs_base__rect_ie_u32 //\nwuffs_base__pixel_config::bounds() {\n return wuffs_base__pixel_config__bounds(this);\n}\n\ninline uint32_t //\nwuffs_base__pixel_config::width() {\n return wuffs_base__pixel_config__width(this);\n}\n\ninline uint32_t //\nwuffs_base__pixel_config::height() {\n return wuffs_base__pixel_config__height(this);\n}\n\ninline size_t //\nwuffs_base__pixel_config::pixbuf_size() {\n return wuffs_base__pixel_config__pixbuf_size(this);\n}\n\n#endif // __cplusplus\n\n" +
"" +
"// --------\n\ntypedef struct {\n wuffs_base__pixel_config pixcfg;\n\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 uint32_t num_loops;\n bool first_frame_is_opaque;\n } private_impl;\n\n#ifdef __cplusplus\n inline void initialize(wuffs_base__pixel_format pixfmt,\n wuffs_base__pixel_subsampling pixsub,\n uint32_t width,\n uint32_t height,\n uint32_t num_loops,\n bool first_frame_is_opaque);\n inline void invalidate();\n inline bool is_valid();\n inline uint32_t num_loops();\n inline uint32_t first_frame_is_opaque();\n#endif // __cplusplus\n\n} wuffs_base__image_config;\n\n// TODO: Should this function return bool? An error type?\nstatic inline void //\nwuffs_base__image_config__initialize(wuffs_base__image_config* c,\n wuffs_base__pixel_format pixfmt,\n " +
" wuffs_base__pixel_subsampling pixsub,\n uint32_t width,\n uint32_t height,\n uint32_t num_loops,\n bool first_frame_is_opaque) {\n if (!c) {\n return;\n }\n if (wuffs_base__pixel_format__is_valid(pixfmt)) {\n c->pixcfg.private_impl.pixfmt = pixfmt;\n c->pixcfg.private_impl.pixsub = pixsub;\n c->pixcfg.private_impl.width = width;\n c->pixcfg.private_impl.height = height;\n c->private_impl.num_loops = num_loops;\n c->private_impl.first_frame_is_opaque = first_frame_is_opaque;\n return;\n }\n *c = ((wuffs_base__image_config){});\n}\n\nstatic inline void //\nwuffs_base__image_config__invalidate(wuffs_base__image_config* c) {\n if (c) {\n *c = ((wuffs_base__image_config){});\n }\n}\n\nstatic inline bool //\nwuffs_base__image_config__is_valid(wuffs_base__image_config* c) {\n return c && wuffs_base__pixel_config__is_valid(&(c->pixcfg));\n}\n\nstatic inline " +
"uint32_t //\nwuffs_base__image_config__num_loops(wuffs_base__image_config* c) {\n return c ? c->private_impl.num_loops : 0;\n}\n\nstatic inline uint32_t //\nwuffs_base__image_config__first_frame_is_opaque(wuffs_base__image_config* c) {\n return c ? c->private_impl.first_frame_is_opaque : false;\n}\n\n#ifdef __cplusplus\n\ninline void //\nwuffs_base__image_config::initialize(wuffs_base__pixel_format pixfmt,\n wuffs_base__pixel_subsampling pixsub,\n uint32_t width,\n uint32_t height,\n uint32_t num_loops,\n bool first_frame_is_opaque) {\n wuffs_base__image_config__initialize(this, pixfmt, pixsub, width, height,\n num_loops, first_frame_is_opaque);\n}\n\ninline void //\nwuffs_base__image_config::invalidate() {\n wuffs_base__image_config__invalidate(this);\n}\n\ninline bool //\nwuffs_base__image_config::is_valid() {\n " +
"return wuffs_base__image_config__is_valid(this);\n}\n\ninline uint32_t //\nwuffs_base__image_config::num_loops() {\n return wuffs_base__image_config__num_loops(this);\n}\n\ninline uint32_t //\nwuffs_base__image_config::first_frame_is_opaque() {\n return wuffs_base__image_config__first_frame_is_opaque(this);\n}\n\n#endif // __cplusplus\n\n" +
"// --------\n\ntypedef struct {\n wuffs_base__pixel_config pixcfg;\n\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__range_ii_u64 work_buffer_size;\n uint32_t num_loops;\n bool first_frame_is_opaque;\n } private_impl;\n\n#ifdef __cplusplus\n inline void initialize(wuffs_base__pixel_format pixfmt,\n wuffs_base__pixel_subsampling pixsub,\n uint32_t width,\n uint32_t height,\n uint64_t work_buffer_size0,\n uint64_t work_buffer_size1,\n uint32_t num_loops,\n bool first_frame_is_opaque);\n inline void invalidate();\n inline bool is_valid();\n inline wuffs_base__range_ii_u64 work_buffer_size();\n inline uint32_t num_loops();\n inline uint32_t first_frame_is_opaque();\n#endif // __cplusplus\n\n} wuffs_base__image_config;\n\n// TODO: Should this function retu" +
"rn bool? An error type?\nstatic inline void //\nwuffs_base__image_config__initialize(wuffs_base__image_config* c,\n wuffs_base__pixel_format pixfmt,\n wuffs_base__pixel_subsampling pixsub,\n uint32_t width,\n uint32_t height,\n uint64_t work_buffer_size0,\n uint64_t work_buffer_size1,\n uint32_t num_loops,\n bool first_frame_is_opaque) {\n if (!c) {\n return;\n }\n if (wuffs_base__pixel_format__is_valid(pixfmt)) {\n c->pixcfg.private_impl.pixfmt = pixfmt;\n c->pixcfg.private_impl.pixsub = pixsub;\n c->pixcfg.private_impl.width = width;\n c->pixcfg.private_impl.height = height;\n c->private_impl.work_buffer_size.min_incl = work_buffer_size0;\n c->private_impl.work_buffer_size.max_incl = work_buffer_size1;\n c->private_im" +
"pl.num_loops = num_loops;\n c->private_impl.first_frame_is_opaque = first_frame_is_opaque;\n return;\n }\n *c = ((wuffs_base__image_config){});\n}\n\nstatic inline void //\nwuffs_base__image_config__invalidate(wuffs_base__image_config* c) {\n if (c) {\n *c = ((wuffs_base__image_config){});\n }\n}\n\nstatic inline bool //\nwuffs_base__image_config__is_valid(wuffs_base__image_config* c) {\n return c && wuffs_base__pixel_config__is_valid(&(c->pixcfg));\n}\n\nstatic inline wuffs_base__range_ii_u64 //\nwuffs_base__image_config__work_buffer_size(wuffs_base__image_config* c) {\n return c ? c->private_impl.work_buffer_size : ((wuffs_base__range_ii_u64){});\n}\n\nstatic inline uint32_t //\nwuffs_base__image_config__num_loops(wuffs_base__image_config* c) {\n return c ? c->private_impl.num_loops : 0;\n}\n\nstatic inline uint32_t //\nwuffs_base__image_config__first_frame_is_opaque(wuffs_base__image_config* c) {\n return c ? c->private_impl.first_frame_is_opaque : false;\n}\n\n#ifdef __cplusplus\n\ninline void //\nwuffs_base__image_con" +
"fig::initialize(wuffs_base__pixel_format pixfmt,\n wuffs_base__pixel_subsampling pixsub,\n uint32_t width,\n uint32_t height,\n uint64_t work_buffer_size0,\n uint64_t work_buffer_size1,\n uint32_t num_loops,\n bool first_frame_is_opaque) {\n wuffs_base__image_config__initialize(this, pixfmt, pixsub, width, height,\n work_buffer_size0, work_buffer_size1,\n num_loops, first_frame_is_opaque);\n}\n\ninline void //\nwuffs_base__image_config::invalidate() {\n wuffs_base__image_config__invalidate(this);\n}\n\ninline bool //\nwuffs_base__image_config::is_valid() {\n return wuffs_base__image_config__is_valid(this);\n}\n\ninline wuffs_base__range_ii_u64 //\nwuffs_base__image_config::work_buffer_size() {\n return wu" +
"ffs_base__image_config__work_buffer_size(this);\n}\n\ninline uint32_t //\nwuffs_base__image_config::num_loops() {\n return wuffs_base__image_config__num_loops(this);\n}\n\ninline uint32_t //\nwuffs_base__image_config::first_frame_is_opaque() {\n return wuffs_base__image_config__first_frame_is_opaque(this);\n}\n\n#endif // __cplusplus\n\n" +
"" +
"// --------\n\n// wuffs_base__animation_blend encodes, for an animated image, how to blend the\n// transparent pixels of this frame with the existing canvas. In Porter-Duff\n// compositing operator terminology:\n// - 0 means the frame may be transparent, and should be blended \"src over\n// dst\", also known as just \"over\".\n// - 1 means the frame may be transparent, and should be blended \"src\".\n// - 2 means the frame is completely opaque, so that \"src over dst\" and \"src\"\n// are equivalent.\n//\n// These semantics are conservative. It is valid for a completely opaque frame\n// to have a blend value other than 2.\ntypedef uint8_t wuffs_base__animation_blend;\n\n#define WUFFS_BASE__ANIMATION_BLEND__SRC_OVER_DST \\\n ((wuffs_base__animation_blend)0)\n#define WUFFS_BASE__ANIMATION_BLEND__SRC ((wuffs_base__animation_blend)1)\n#define WUFFS_BASE__ANIMATION_BLEND__OPAQUE ((wuffs_base__animation_blend)2)\n\n" +
"" +
+31 -6
View File
@@ -81,9 +81,13 @@ size_t src_len = 0;
wuffs_base__color_u32argb* dst_buffer = NULL;
wuffs_base__color_u32argb* prev_dst_buffer = NULL;
size_t dst_len; // Length in bytes.
uint8_t* image_buffer = NULL;
size_t image_len = 0;
uint8_t* work_buffer = NULL;
size_t work_len = 0;
uint8_t* print_buffer = NULL;
size_t print_len = 0;
@@ -220,8 +224,8 @@ size_t print_color_art(wuffs_base__pixel_buffer* pb) {
// ----
const char* allocate(wuffs_base__pixel_config* pc) {
image_len = wuffs_base__pixel_config__pixbuf_size(pc);
const char* allocate(wuffs_base__image_config* ic) {
image_len = wuffs_base__pixel_config__pixbuf_size(&ic->pixcfg);
if (image_len > (SIZE_MAX / sizeof(wuffs_base__color_u32argb))) {
return "could not allocate dst buffer";
}
@@ -248,8 +252,24 @@ const char* allocate(wuffs_base__pixel_config* pc) {
return "could not allocate image buffer";
}
uint32_t width = wuffs_base__pixel_config__width(pc);
uint32_t height = wuffs_base__pixel_config__height(pc);
uint64_t work_len_u64 =
wuffs_base__image_config__work_buffer_size(ic).max_incl;
if (work_len_u64 <= SIZE_MAX) {
work_buffer = malloc(work_len_u64);
work_len = work_len_u64;
}
if (!work_buffer) {
free(image_buffer);
image_buffer = NULL;
free(prev_dst_buffer);
prev_dst_buffer = NULL;
free(dst_buffer);
dst_buffer = NULL;
return "could not allocate image buffer";
}
uint32_t width = wuffs_base__pixel_config__width(&ic->pixcfg);
uint32_t height = wuffs_base__pixel_config__height(&ic->pixcfg);
uint64_t plen = 1 + ((uint64_t)(width) + 1) * (uint64_t)(height);
uint64_t bytes_per_print_pixel = color_flag ? BYTES_PER_COLOR_PIXEL : 1;
if (plen <= ((uint64_t)SIZE_MAX) / bytes_per_print_pixel) {
@@ -257,6 +277,8 @@ const char* allocate(wuffs_base__pixel_config* pc) {
print_buffer = malloc(print_len);
}
if (!print_buffer) {
free(work_buffer);
work_buffer = NULL;
free(image_buffer);
image_buffer = NULL;
free(prev_dst_buffer);
@@ -301,7 +323,7 @@ const char* play() {
if ((width > MAX_DIMENSION) || (height > MAX_DIMENSION)) {
return "image dimensions are too large";
}
const char* msg = allocate(&ic.pixcfg);
const char* msg = allocate(&ic);
if (msg) {
return msg;
}
@@ -335,7 +357,10 @@ const char* play() {
}
z = wuffs_gif__decoder__decode_frame(&dec, &pb, 0, 0, src_reader,
((wuffs_base__slice_u8){}));
((wuffs_base__slice_u8){
.ptr = work_buffer,
.len = work_len,
}));
if (z) {
if (z == wuffs_base__warning__end_of_data) {
break;
+22 -1
View File
@@ -49,6 +49,7 @@ It should print "PASS", amongst other information, and exit(0).
const char* fuzz(wuffs_base__io_reader src_reader, uint32_t hash) {
const char* ret = NULL;
void* pixbuf = NULL;
void* workbuf = NULL;
// Use a {} code block so that "goto exit" doesn't trigger "jump bypasses
// variable initialization" warnings.
@@ -72,6 +73,19 @@ const char* fuzz(wuffs_base__io_reader src_reader, uint32_t hash) {
goto exit;
}
uint64_t workbuf_size =
wuffs_base__image_config__work_buffer_size(&ic).max_incl;
// Don't try to allocate more than 64 MiB.
if ((workbuf_size > 64 * 1024 * 1024) || (workbuf_size > SIZE_MAX)) {
ret = "image too large";
goto exit;
}
workbuf = malloc(workbuf_size);
if (!workbuf) {
ret = "out of memory";
goto exit;
}
size_t pixbuf_size = wuffs_base__pixel_config__pixbuf_size(&ic.pixcfg);
// Don't try to allocate more than 64 MiB.
if (pixbuf_size > 64 * 1024 * 1024) {
@@ -83,6 +97,7 @@ const char* fuzz(wuffs_base__io_reader src_reader, uint32_t hash) {
ret = "out of memory";
goto exit;
}
wuffs_base__pixel_buffer pb = ((wuffs_base__pixel_buffer){});
z = wuffs_base__pixel_buffer__set_from_slice(
&pb, &ic.pixcfg,
@@ -95,7 +110,10 @@ const char* fuzz(wuffs_base__io_reader src_reader, uint32_t hash) {
bool seen_ok = false;
while (true) {
z = wuffs_gif__decoder__decode_frame(&dec, &pb, 0, 0, src_reader,
((wuffs_base__slice_u8){}));
((wuffs_base__slice_u8){
.ptr = workbuf,
.len = workbuf_size,
}));
if (z) {
if ((z != wuffs_base__warning__end_of_data) || !seen_ok) {
ret = z;
@@ -107,6 +125,9 @@ const char* fuzz(wuffs_base__io_reader src_reader, uint32_t hash) {
}
exit:
if (workbuf) {
free(workbuf);
}
if (pixbuf) {
free(pixbuf);
}
+2
View File
@@ -29,6 +29,7 @@ var StatusList = [...]string{
"?bad receiver",
"?bad restart",
"?bad sizeof receiver",
"?bad work buffer length",
"?bad wuffs version",
"?cannot return a suspension",
"?check_wuffs_version not applicable",
@@ -243,6 +244,7 @@ var Funcs = []string{
// ---- image_config
"image_config.initialize!(pixfmt u32, pixsub u32, width u32, height u32, " +
"work_buffer_size0 u64, work_buffer_size1 u64, " +
"num_loops u32, first_frame_is_opaque bool)",
// ---- pixel_buffer
+31 -1
View File
@@ -141,6 +141,7 @@ extern const char* wuffs_base__error__bad_call_sequence;
extern const char* wuffs_base__error__bad_receiver;
extern const char* wuffs_base__error__bad_restart;
extern const char* wuffs_base__error__bad_sizeof_receiver;
extern const char* wuffs_base__error__bad_work_buffer_length;
extern const char* wuffs_base__error__bad_wuffs_version;
extern const char* wuffs_base__error__cannot_return_a_suspension;
extern const char* wuffs_base__error__check_wuffs_version_not_applicable;
@@ -1550,6 +1551,7 @@ typedef struct {
// Do not access the private_impl's fields directly. There is no API/ABI
// compatibility or safety guarantee if you do so.
struct {
wuffs_base__range_ii_u64 work_buffer_size;
uint32_t num_loops;
bool first_frame_is_opaque;
} private_impl;
@@ -1559,10 +1561,13 @@ typedef struct {
wuffs_base__pixel_subsampling pixsub,
uint32_t width,
uint32_t height,
uint64_t work_buffer_size0,
uint64_t work_buffer_size1,
uint32_t num_loops,
bool first_frame_is_opaque);
inline void invalidate();
inline bool is_valid();
inline wuffs_base__range_ii_u64 work_buffer_size();
inline uint32_t num_loops();
inline uint32_t first_frame_is_opaque();
#endif // __cplusplus
@@ -1576,6 +1581,8 @@ wuffs_base__image_config__initialize(wuffs_base__image_config* c,
wuffs_base__pixel_subsampling pixsub,
uint32_t width,
uint32_t height,
uint64_t work_buffer_size0,
uint64_t work_buffer_size1,
uint32_t num_loops,
bool first_frame_is_opaque) {
if (!c) {
@@ -1586,6 +1593,8 @@ wuffs_base__image_config__initialize(wuffs_base__image_config* c,
c->pixcfg.private_impl.pixsub = pixsub;
c->pixcfg.private_impl.width = width;
c->pixcfg.private_impl.height = height;
c->private_impl.work_buffer_size.min_incl = work_buffer_size0;
c->private_impl.work_buffer_size.max_incl = work_buffer_size1;
c->private_impl.num_loops = num_loops;
c->private_impl.first_frame_is_opaque = first_frame_is_opaque;
return;
@@ -1605,6 +1614,11 @@ wuffs_base__image_config__is_valid(wuffs_base__image_config* c) {
return c && wuffs_base__pixel_config__is_valid(&(c->pixcfg));
}
static inline wuffs_base__range_ii_u64 //
wuffs_base__image_config__work_buffer_size(wuffs_base__image_config* c) {
return c ? c->private_impl.work_buffer_size : ((wuffs_base__range_ii_u64){});
}
static inline uint32_t //
wuffs_base__image_config__num_loops(wuffs_base__image_config* c) {
return c ? c->private_impl.num_loops : 0;
@@ -1622,9 +1636,12 @@ wuffs_base__image_config::initialize(wuffs_base__pixel_format pixfmt,
wuffs_base__pixel_subsampling pixsub,
uint32_t width,
uint32_t height,
uint64_t work_buffer_size0,
uint64_t work_buffer_size1,
uint32_t num_loops,
bool first_frame_is_opaque) {
wuffs_base__image_config__initialize(this, pixfmt, pixsub, width, height,
work_buffer_size0, work_buffer_size1,
num_loops, first_frame_is_opaque);
}
@@ -1638,6 +1655,11 @@ wuffs_base__image_config::is_valid() {
return wuffs_base__image_config__is_valid(this);
}
inline wuffs_base__range_ii_u64 //
wuffs_base__image_config::work_buffer_size() {
return wuffs_base__image_config__work_buffer_size(this);
}
inline uint32_t //
wuffs_base__image_config::num_loops() {
return wuffs_base__image_config__num_loops(this);
@@ -3616,6 +3638,8 @@ const char* wuffs_base__error__bad_receiver = "?base: bad receiver";
const char* wuffs_base__error__bad_restart = "?base: bad restart";
const char* wuffs_base__error__bad_sizeof_receiver =
"?base: bad sizeof receiver";
const char* wuffs_base__error__bad_work_buffer_length =
"?base: bad work buffer length";
const char* wuffs_base__error__bad_wuffs_version = "?base: bad wuffs version";
const char* wuffs_base__error__cannot_return_a_suspension =
"?base: cannot return a suspension";
@@ -6401,7 +6425,8 @@ wuffs_gif__decoder__decode_image_config(wuffs_gif__decoder* self,
if (a_dst != NULL) {
wuffs_base__image_config__initialize(
a_dst, 570984584, 0, self->private_impl.f_width,
self->private_impl.f_height, v_num_loops, v_ffio);
self->private_impl.f_height, ((uint64_t)(self->private_impl.f_width)),
((uint64_t)(self->private_impl.f_width)), v_num_loops, v_ffio);
}
self->private_impl.f_call_sequence = 1;
@@ -6729,6 +6754,11 @@ wuffs_gif__decoder__decode_frame(wuffs_gif__decoder* self,
switch (coro_susp_point) {
WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0;
if (((uint64_t)(a_work_buffer.len)) !=
((uint64_t)(self->private_impl.f_width))) {
status = wuffs_base__error__bad_work_buffer_length;
goto exit;
}
if (self->private_impl.f_call_sequence != 2) {
WUFFS_BASE__COROUTINE_SUSPENSION_POINT(1);
status = wuffs_gif__decoder__decode_frame_config(self, NULL, a_src);
+5
View File
@@ -148,6 +148,8 @@ pub func decoder.decode_image_config!??(dst nptr base.image_config, src base.io_
pixsub:0,
width:this.width,
height:this.height,
work_buffer_size0:this.width as base.u64,
work_buffer_size1:this.width as base.u64,
num_loops:num_loops,
first_frame_is_opaque:ffio)
}
@@ -234,6 +236,9 @@ pri func decoder.skip_frame!??(src base.io_reader) {
// TODO: honor pixbuf_origin_x and pixbuf_origin_y args.
pub func decoder.decode_frame!??(dst ptr base.pixel_buffer, pixbuf_origin_x base.u32, pixbuf_origin_y base.u32, src base.io_reader, work_buffer slice base.u8) {
if args.work_buffer.length() != (this.width as base.u64) {
return status "?bad work buffer length"
}
if this.call_sequence != 2 {
this.decode_frame_config!??(dst:nullptr, src:args.src)
}
+41 -6
View File
@@ -220,6 +220,16 @@ const char* wuffs_gif_decode(wuffs_base__io_buffer* dst,
return z;
}
uint64_t work_buffer_size =
wuffs_base__image_config__work_buffer_size(&ic).max_incl;
if (work_buffer_size > BUFFER_SIZE) {
return "work buffer size is too large";
}
wuffs_base__slice_u8 work_buffer = ((wuffs_base__slice_u8){
.ptr = global_work_buffer,
.len = work_buffer_size,
});
while (true) {
z = wuffs_gif__decoder__decode_frame_config(&dec, &fc, src_reader);
if (z) {
@@ -230,7 +240,7 @@ const char* wuffs_gif_decode(wuffs_base__io_buffer* dst,
}
z = wuffs_gif__decoder__decode_frame(&dec, &pb, 0, 0, src_reader,
((wuffs_base__slice_u8){}));
work_buffer);
if (z) {
return z;
}
@@ -295,6 +305,11 @@ bool do_test_wuffs_gif_decode(const char* filename,
wuffs_base__pixel_config__height(&ic.pixcfg));
return false;
}
if (wuffs_base__image_config__work_buffer_size(&ic).max_incl != 160) {
FAIL("work_buffer_size: got %" PRIu64 ", want 160",
wuffs_base__image_config__work_buffer_size(&ic).max_incl);
return false;
}
if (wuffs_base__image_config__num_loops(&ic) != 1) {
FAIL("num_loops: got %" PRIu32 ", want 1",
wuffs_base__image_config__num_loops(&ic));
@@ -316,6 +331,11 @@ bool do_test_wuffs_gif_decode(const char* filename,
}
}
wuffs_base__slice_u8 work_buffer = ((wuffs_base__slice_u8){
.ptr = global_work_buffer,
.len = 160,
});
int num_iters = 0;
while (true) {
num_iters++;
@@ -356,7 +376,7 @@ bool do_test_wuffs_gif_decode(const char* filename,
size_t old_ri = src.ri;
wuffs_base__status z = wuffs_gif__decoder__decode_frame(
&dec, &pb, 0, 0, src_reader, ((wuffs_base__slice_u8){}));
&dec, &pb, 0, 0, src_reader, work_buffer);
if (!z) {
break;
@@ -427,7 +447,7 @@ bool do_test_wuffs_gif_decode(const char* filename,
}
wuffs_base__io_reader src_reader = wuffs_base__io_buffer__reader(&src);
wuffs_base__status z = wuffs_gif__decoder__decode_frame(
&dec, &pb, 0, 0, src_reader, ((wuffs_base__slice_u8){}));
&dec, &pb, 0, 0, src_reader, work_buffer);
if (z != wuffs_base__warning__end_of_data) {
FAIL("decode_frame: got \"%s\", want \"%s\"", z,
wuffs_base__warning__end_of_data);
@@ -505,6 +525,16 @@ bool do_test_wuffs_gif_decode_animated(
return false;
}
uint64_t work_buffer_size =
wuffs_base__image_config__work_buffer_size(&ic).max_incl;
if (work_buffer_size > BUFFER_SIZE) {
return "work buffer size is too large";
}
wuffs_base__slice_u8 work_buffer = ((wuffs_base__slice_u8){
.ptr = global_work_buffer,
.len = work_buffer_size,
});
if (wuffs_base__image_config__num_loops(&ic) != want_num_loops) {
FAIL("num_loops: got %" PRIu32 ", want %" PRIu32,
wuffs_base__image_config__num_loops(&ic), want_num_loops);
@@ -531,7 +561,7 @@ bool do_test_wuffs_gif_decode_animated(
}
z = wuffs_gif__decoder__decode_frame(&dec, &pb, 0, 0, src_reader,
((wuffs_base__slice_u8){}));
work_buffer);
if (z) {
FAIL("decode_frame #%" PRIu32 ": got \"%s\"", i, z);
return false;
@@ -556,7 +586,7 @@ bool do_test_wuffs_gif_decode_animated(
// decode_frame.
for (i = 0; i < 3; i++) {
z = wuffs_gif__decoder__decode_frame(&dec, &pb, 0, 0, src_reader,
((wuffs_base__slice_u8){}));
work_buffer);
if (z != wuffs_base__warning__end_of_data) {
FAIL("decode_frame: got \"%s\", want \"%s\"", z,
wuffs_base__warning__end_of_data);
@@ -741,6 +771,11 @@ bool do_test_wuffs_gif_num_decoded(bool frame_config) {
}
}
wuffs_base__slice_u8 work_buffer = ((wuffs_base__slice_u8){
.ptr = global_work_buffer,
.len = 64,
});
const char* method = frame_config ? "decode_frame_config" : "decode_frame";
bool end_of_data = false;
uint64_t want = 0;
@@ -763,7 +798,7 @@ bool do_test_wuffs_gif_num_decoded(bool frame_config) {
z = wuffs_gif__decoder__decode_frame_config(&dec, NULL, src_reader);
} else {
z = wuffs_gif__decoder__decode_frame(&dec, &pb, 0, 0, src_reader,
((wuffs_base__slice_u8){}));
work_buffer);
}
if (!z) {
+1
View File
@@ -26,6 +26,7 @@
uint8_t global_got_buffer[BUFFER_SIZE];
uint8_t global_want_buffer[BUFFER_SIZE];
uint8_t global_work_buffer[BUFFER_SIZE];
uint8_t global_src_buffer[BUFFER_SIZE];
uint8_t global_pixel_buffer[BUFFER_SIZE];
uint8_t global_palette_buffer[PALETTE_BUFFER_SIZE];