From 5bf7c5c051aaed4b8149d4b2891a41775af3f7a9 Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Sat, 8 Sep 2018 08:40:45 +1000 Subject: [PATCH] Add image_config.first_frame_io_position Also fix a type typo for image_config.first_frame_is_opaque. --- cmd/wuffs-c/internal/cgen/base/image-public.h | 28 +++++++++++++---- cmd/wuffs-c/internal/cgen/data.go | 10 +++--- lang/builtin/builtin.go | 2 +- release/c/wuffs-unsupported-snapshot.h | 31 ++++++++++++++----- std/gif/decode_gif.wuffs | 1 + 5 files changed, 53 insertions(+), 19 deletions(-) diff --git a/cmd/wuffs-c/internal/cgen/base/image-public.h b/cmd/wuffs-c/internal/cgen/base/image-public.h index a767425f..dc4f627f 100644 --- a/cmd/wuffs-c/internal/cgen/base/image-public.h +++ b/cmd/wuffs-c/internal/cgen/base/image-public.h @@ -446,6 +446,7 @@ typedef struct { // compatibility or safety guarantee if you do so. struct { wuffs_base__range_ii_u64 work_buffer_size; + uint64_t first_frame_io_position; uint32_t num_loops; bool first_frame_is_opaque; } private_impl; @@ -458,12 +459,14 @@ typedef struct { uint64_t work_buffer_size0, uint64_t work_buffer_size1, uint32_t num_loops, + uint64_t first_frame_io_position, 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(); + inline uint64_t first_frame_io_position(); + inline bool first_frame_is_opaque(); #endif // __cplusplus } wuffs_base__image_config; @@ -478,6 +481,7 @@ wuffs_base__image_config__initialize(wuffs_base__image_config* c, uint64_t work_buffer_size0, uint64_t work_buffer_size1, uint32_t num_loops, + uint64_t first_frame_io_position, bool first_frame_is_opaque) { if (!c) { return; @@ -489,6 +493,7 @@ wuffs_base__image_config__initialize(wuffs_base__image_config* c, 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.first_frame_io_position = first_frame_io_position; c->private_impl.num_loops = num_loops; c->private_impl.first_frame_is_opaque = first_frame_is_opaque; return; @@ -518,7 +523,12 @@ wuffs_base__image_config__num_loops(wuffs_base__image_config* c) { return c ? c->private_impl.num_loops : 0; } -static inline uint32_t // +static inline uint64_t // +wuffs_base__image_config__first_frame_io_position(wuffs_base__image_config* c) { + return c ? c->private_impl.first_frame_io_position : 0; +} + +static inline bool // wuffs_base__image_config__first_frame_is_opaque(wuffs_base__image_config* c) { return c ? c->private_impl.first_frame_is_opaque : false; } @@ -533,10 +543,11 @@ wuffs_base__image_config::initialize(wuffs_base__pixel_format pixfmt, uint64_t work_buffer_size0, uint64_t work_buffer_size1, uint32_t num_loops, + uint64_t first_frame_io_position, 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); + wuffs_base__image_config__initialize( + this, pixfmt, pixsub, width, height, work_buffer_size0, work_buffer_size1, + num_loops, first_frame_io_position, first_frame_is_opaque); } inline void // @@ -559,7 +570,12 @@ wuffs_base__image_config::num_loops() { return wuffs_base__image_config__num_loops(this); } -inline uint32_t // +inline uint64_t // +wuffs_base__image_config::first_frame_io_position() { + return wuffs_base__image_config__first_frame_io_position(this); +} + +inline bool // wuffs_base__image_config::first_frame_is_opaque() { return wuffs_base__image_config__first_frame_is_opaque(this); } diff --git a/cmd/wuffs-c/internal/cgen/data.go b/cmd/wuffs-c/internal/cgen/data.go index d8f91aa8..0d18b35f 100644 --- a/cmd/wuffs-c/internal/cgen/data.go +++ b/cmd/wuffs-c/internal/cgen/data.go @@ -138,11 +138,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 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\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 uint64_t first_frame_io_position;\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 uint64_t first_frame_io_position,\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 uint64_t first_frame_io_" + + "position();\n inline bool 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 uint64_t work_buffer_size0,\n uint64_t work_buffer_size1,\n uint32_t num_loops,\n uint64_t first_frame_io_position,\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.w" + + "idth = 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_impl.first_frame_io_position = first_frame_io_position;\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 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 uint64_t //\nwuffs_base__image_config__first_frame_io_position(wuffs_base__image_config* c) {\n return c ? c->private_impl.first_frame_io_position : 0;\n}\n\nstatic inline bool //\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 uint64_t work_buffer_size0,\n uint64_t work_buffer_size1,\n uint32_t num_loops,\n uint64_t first_frame_io_position,\n bool first_frame_is_opaque) {\n wuffs_base__image_con" + + "fig__initialize(\n this, pixfmt, pixsub, width, height, work_buffer_size0, work_buffer_size1,\n num_loops, first_frame_io_position, 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 wuffs_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 uint64_t //\nwuffs_base__image_config::first_frame_io_position() {\n return wuffs_base__image_config__first_frame_io_position(this);\n}\n\ninline bool //\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" + "" + diff --git a/lang/builtin/builtin.go b/lang/builtin/builtin.go index 3eaaaf53..d1e0a310 100644 --- a/lang/builtin/builtin.go +++ b/lang/builtin/builtin.go @@ -247,7 +247,7 @@ var Funcs = []string{ "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)", + "num_loops u32, first_frame_io_position u64, first_frame_is_opaque bool)", // ---- pixel_buffer diff --git a/release/c/wuffs-unsupported-snapshot.h b/release/c/wuffs-unsupported-snapshot.h index ca50ee1e..eac7dda9 100644 --- a/release/c/wuffs-unsupported-snapshot.h +++ b/release/c/wuffs-unsupported-snapshot.h @@ -1574,6 +1574,7 @@ typedef struct { // compatibility or safety guarantee if you do so. struct { wuffs_base__range_ii_u64 work_buffer_size; + uint64_t first_frame_io_position; uint32_t num_loops; bool first_frame_is_opaque; } private_impl; @@ -1586,12 +1587,14 @@ typedef struct { uint64_t work_buffer_size0, uint64_t work_buffer_size1, uint32_t num_loops, + uint64_t first_frame_io_position, 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(); + inline uint64_t first_frame_io_position(); + inline bool first_frame_is_opaque(); #endif // __cplusplus } wuffs_base__image_config; @@ -1606,6 +1609,7 @@ wuffs_base__image_config__initialize(wuffs_base__image_config* c, uint64_t work_buffer_size0, uint64_t work_buffer_size1, uint32_t num_loops, + uint64_t first_frame_io_position, bool first_frame_is_opaque) { if (!c) { return; @@ -1617,6 +1621,7 @@ wuffs_base__image_config__initialize(wuffs_base__image_config* c, 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.first_frame_io_position = first_frame_io_position; c->private_impl.num_loops = num_loops; c->private_impl.first_frame_is_opaque = first_frame_is_opaque; return; @@ -1646,7 +1651,12 @@ wuffs_base__image_config__num_loops(wuffs_base__image_config* c) { return c ? c->private_impl.num_loops : 0; } -static inline uint32_t // +static inline uint64_t // +wuffs_base__image_config__first_frame_io_position(wuffs_base__image_config* c) { + return c ? c->private_impl.first_frame_io_position : 0; +} + +static inline bool // wuffs_base__image_config__first_frame_is_opaque(wuffs_base__image_config* c) { return c ? c->private_impl.first_frame_is_opaque : false; } @@ -1661,10 +1671,11 @@ wuffs_base__image_config::initialize(wuffs_base__pixel_format pixfmt, uint64_t work_buffer_size0, uint64_t work_buffer_size1, uint32_t num_loops, + uint64_t first_frame_io_position, 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); + wuffs_base__image_config__initialize( + this, pixfmt, pixsub, width, height, work_buffer_size0, work_buffer_size1, + num_loops, first_frame_io_position, first_frame_is_opaque); } inline void // @@ -1687,7 +1698,12 @@ wuffs_base__image_config::num_loops() { return wuffs_base__image_config__num_loops(this); } -inline uint32_t // +inline uint64_t // +wuffs_base__image_config::first_frame_io_position() { + return wuffs_base__image_config__first_frame_io_position(this); +} + +inline bool // wuffs_base__image_config::first_frame_is_opaque() { return wuffs_base__image_config__first_frame_is_opaque(this); } @@ -6464,7 +6480,8 @@ wuffs_gif__decoder__decode_image_config(wuffs_gif__decoder* self, wuffs_base__image_config__initialize( a_dst, 570984584, 0, self->private_impl.f_width, self->private_impl.f_height, ((uint64_t)(self->private_impl.f_width)), - ((uint64_t)(self->private_impl.f_width)), v_num_loops, v_ffio); + ((uint64_t)(self->private_impl.f_width)), v_num_loops, + self->private_impl.f_frame_config_io_position, v_ffio); } self->private_impl.f_call_sequence = 1; diff --git a/std/gif/decode_gif.wuffs b/std/gif/decode_gif.wuffs index e31a61d6..6eb72c96 100644 --- a/std/gif/decode_gif.wuffs +++ b/std/gif/decode_gif.wuffs @@ -151,6 +151,7 @@ pub func decoder.decode_image_config!??(dst nptr base.image_config, src base.io_ work_buffer_size0:this.width as base.u64, work_buffer_size1:this.width as base.u64, num_loops:num_loops, + first_frame_io_position:this.frame_config_io_position, first_frame_is_opaque:ffio) }