diff --git a/cmd/wuffs-c/internal/cgen/base-header.h b/cmd/wuffs-c/internal/cgen/base-header.h index 79d72a88..038b8492 100644 --- a/cmd/wuffs-c/internal/cgen/base-header.h +++ b/cmd/wuffs-c/internal/cgen/base-header.h @@ -1145,9 +1145,11 @@ static inline wuffs_base__flicks wuffs_base__image_buffer__duration( // wuffs_base__image_buffer__palette returns the palette that the pixel data // can index. The backing array is inside b and has length 1024. -static inline uint8_t* wuffs_base__image_buffer__palette( +static inline wuffs_base__slice_u8 wuffs_base__image_buffer__palette( wuffs_base__image_buffer* b) { - return b ? b->private_impl.palette : NULL; + return b ? ((wuffs_base__slice_u8){.ptr = b->private_impl.palette, + .len = 1024}) + : ((wuffs_base__slice_u8){}); } static inline wuffs_base__table_u8 wuffs_base__image_buffer__plane( diff --git a/cmd/wuffs-c/internal/cgen/data.go b/cmd/wuffs-c/internal/cgen/data.go index d5770348..6ee1bf2d 100644 --- a/cmd/wuffs-c/internal/cgen/data.go +++ b/cmd/wuffs-c/internal/cgen/data.go @@ -82,7 +82,7 @@ const baseHeader = "" + "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" + + "pixel data\n// can index. The backing array is inside b and has length 1024.\nstatic inline wuffs_base__slice_u8 wuffs_base__image_buffer__palette(\n wuffs_base__image_buffer* b) {\n return b ? ((wuffs_base__slice_u8){.ptr = b->private_impl.palette,\n .len = 1024})\n : ((wuffs_base__slice_u8){});\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 = "" + diff --git a/example/gifplayer/gifplayer.c b/example/gifplayer/gifplayer.c index a01af5e1..42781439 100644 --- a/example/gifplayer/gifplayer.c +++ b/example/gifplayer/gifplayer.c @@ -127,6 +127,26 @@ const char* play() { return wuffs_gif__status__string(s); } + // Calculate a grayscale value and therefore an ASCII art character for + // each (red, green, blue) palette entry. + wuffs_base__slice_u8 palette = wuffs_base__image_buffer__palette(&ib); + char palette_as_ascii_art[256]; + if (palette.ptr) { + uint32_t i; + for (i = 0; i < 256; i++) { + // Convert to grayscale via the formula + // Y = (0.299 * R) + (0.587 * G) + (0.114 * B) + // translated into fixed point arithmetic. + uint32_t b = palette.ptr[4 * i + 0]; + uint32_t g = palette.ptr[4 * i + 1]; + uint32_t r = palette.ptr[4 * i + 2]; + uint32_t y = ((19595 * r) + (38470 * g) + (7471 * b) + (1 << 15)) >> 16; + palette_as_ascii_art[i] = "-+X@"[(y & 0xFF) >> 6]; + } + } else { + memset(palette_as_ascii_art, '-', 256); + } + // TODO: don't hard code the 100ms sleep time. Wuffs needs an API to // provide the frame delay, and this program should also track that across // the last frame of one play through and the first frame of the next. The @@ -140,10 +160,7 @@ const char* play() { for (y = 0; y < height; y++) { uint32_t x; for (x = 0; x < width; x++) { - uint8_t palette_index = *d++; - // TODO: translate the palette_index into an (R, G, B) triple, and then - // to a uint8_t grayscale value. - *p++ = "-+X@"[palette_index >> 6]; + *p++ = palette_as_ascii_art[*d++]; } *p++ = '\n'; } diff --git a/gen/c/std/adler32.c b/gen/c/std/adler32.c index 09617319..108e58ea 100644 --- a/gen/c/std/adler32.c +++ b/gen/c/std/adler32.c @@ -1148,9 +1148,11 @@ static inline wuffs_base__flicks wuffs_base__image_buffer__duration( // wuffs_base__image_buffer__palette returns the palette that the pixel data // can index. The backing array is inside b and has length 1024. -static inline uint8_t* wuffs_base__image_buffer__palette( +static inline wuffs_base__slice_u8 wuffs_base__image_buffer__palette( wuffs_base__image_buffer* b) { - return b ? b->private_impl.palette : NULL; + return b ? ((wuffs_base__slice_u8){.ptr = b->private_impl.palette, + .len = 1024}) + : ((wuffs_base__slice_u8){}); } static inline wuffs_base__table_u8 wuffs_base__image_buffer__plane( diff --git a/gen/c/std/crc32.c b/gen/c/std/crc32.c index a1bb0213..f2521fb9 100644 --- a/gen/c/std/crc32.c +++ b/gen/c/std/crc32.c @@ -1148,9 +1148,11 @@ static inline wuffs_base__flicks wuffs_base__image_buffer__duration( // wuffs_base__image_buffer__palette returns the palette that the pixel data // can index. The backing array is inside b and has length 1024. -static inline uint8_t* wuffs_base__image_buffer__palette( +static inline wuffs_base__slice_u8 wuffs_base__image_buffer__palette( wuffs_base__image_buffer* b) { - return b ? b->private_impl.palette : NULL; + return b ? ((wuffs_base__slice_u8){.ptr = b->private_impl.palette, + .len = 1024}) + : ((wuffs_base__slice_u8){}); } static inline wuffs_base__table_u8 wuffs_base__image_buffer__plane( diff --git a/gen/c/std/deflate.c b/gen/c/std/deflate.c index 2d182e9a..de2a026f 100644 --- a/gen/c/std/deflate.c +++ b/gen/c/std/deflate.c @@ -1148,9 +1148,11 @@ static inline wuffs_base__flicks wuffs_base__image_buffer__duration( // wuffs_base__image_buffer__palette returns the palette that the pixel data // can index. The backing array is inside b and has length 1024. -static inline uint8_t* wuffs_base__image_buffer__palette( +static inline wuffs_base__slice_u8 wuffs_base__image_buffer__palette( wuffs_base__image_buffer* b) { - return b ? b->private_impl.palette : NULL; + return b ? ((wuffs_base__slice_u8){.ptr = b->private_impl.palette, + .len = 1024}) + : ((wuffs_base__slice_u8){}); } static inline wuffs_base__table_u8 wuffs_base__image_buffer__plane( diff --git a/gen/c/std/gif.c b/gen/c/std/gif.c index b557a6cc..cf34455e 100644 --- a/gen/c/std/gif.c +++ b/gen/c/std/gif.c @@ -1148,9 +1148,11 @@ static inline wuffs_base__flicks wuffs_base__image_buffer__duration( // wuffs_base__image_buffer__palette returns the palette that the pixel data // can index. The backing array is inside b and has length 1024. -static inline uint8_t* wuffs_base__image_buffer__palette( +static inline wuffs_base__slice_u8 wuffs_base__image_buffer__palette( wuffs_base__image_buffer* b) { - return b ? b->private_impl.palette : NULL; + return b ? ((wuffs_base__slice_u8){.ptr = b->private_impl.palette, + .len = 1024}) + : ((wuffs_base__slice_u8){}); } static inline wuffs_base__table_u8 wuffs_base__image_buffer__plane( diff --git a/gen/c/std/gzip.c b/gen/c/std/gzip.c index d7a8029a..5df06beb 100644 --- a/gen/c/std/gzip.c +++ b/gen/c/std/gzip.c @@ -1148,9 +1148,11 @@ static inline wuffs_base__flicks wuffs_base__image_buffer__duration( // wuffs_base__image_buffer__palette returns the palette that the pixel data // can index. The backing array is inside b and has length 1024. -static inline uint8_t* wuffs_base__image_buffer__palette( +static inline wuffs_base__slice_u8 wuffs_base__image_buffer__palette( wuffs_base__image_buffer* b) { - return b ? b->private_impl.palette : NULL; + return b ? ((wuffs_base__slice_u8){.ptr = b->private_impl.palette, + .len = 1024}) + : ((wuffs_base__slice_u8){}); } static inline wuffs_base__table_u8 wuffs_base__image_buffer__plane( diff --git a/gen/c/std/zlib.c b/gen/c/std/zlib.c index 92d48ff8..986c00f8 100644 --- a/gen/c/std/zlib.c +++ b/gen/c/std/zlib.c @@ -1148,9 +1148,11 @@ static inline wuffs_base__flicks wuffs_base__image_buffer__duration( // wuffs_base__image_buffer__palette returns the palette that the pixel data // can index. The backing array is inside b and has length 1024. -static inline uint8_t* wuffs_base__image_buffer__palette( +static inline wuffs_base__slice_u8 wuffs_base__image_buffer__palette( wuffs_base__image_buffer* b) { - return b ? b->private_impl.palette : NULL; + return b ? ((wuffs_base__slice_u8){.ptr = b->private_impl.palette, + .len = 1024}) + : ((wuffs_base__slice_u8){}); } static inline wuffs_base__table_u8 wuffs_base__image_buffer__plane( diff --git a/gen/h/std/adler32.h b/gen/h/std/adler32.h index 9946bed8..ba1c8f4f 100644 --- a/gen/h/std/adler32.h +++ b/gen/h/std/adler32.h @@ -1148,9 +1148,11 @@ static inline wuffs_base__flicks wuffs_base__image_buffer__duration( // wuffs_base__image_buffer__palette returns the palette that the pixel data // can index. The backing array is inside b and has length 1024. -static inline uint8_t* wuffs_base__image_buffer__palette( +static inline wuffs_base__slice_u8 wuffs_base__image_buffer__palette( wuffs_base__image_buffer* b) { - return b ? b->private_impl.palette : NULL; + return b ? ((wuffs_base__slice_u8){.ptr = b->private_impl.palette, + .len = 1024}) + : ((wuffs_base__slice_u8){}); } static inline wuffs_base__table_u8 wuffs_base__image_buffer__plane( diff --git a/gen/h/std/crc32.h b/gen/h/std/crc32.h index cc136186..e48c40c2 100644 --- a/gen/h/std/crc32.h +++ b/gen/h/std/crc32.h @@ -1148,9 +1148,11 @@ static inline wuffs_base__flicks wuffs_base__image_buffer__duration( // wuffs_base__image_buffer__palette returns the palette that the pixel data // can index. The backing array is inside b and has length 1024. -static inline uint8_t* wuffs_base__image_buffer__palette( +static inline wuffs_base__slice_u8 wuffs_base__image_buffer__palette( wuffs_base__image_buffer* b) { - return b ? b->private_impl.palette : NULL; + return b ? ((wuffs_base__slice_u8){.ptr = b->private_impl.palette, + .len = 1024}) + : ((wuffs_base__slice_u8){}); } static inline wuffs_base__table_u8 wuffs_base__image_buffer__plane( diff --git a/gen/h/std/deflate.h b/gen/h/std/deflate.h index e01c6277..20e3b102 100644 --- a/gen/h/std/deflate.h +++ b/gen/h/std/deflate.h @@ -1148,9 +1148,11 @@ static inline wuffs_base__flicks wuffs_base__image_buffer__duration( // wuffs_base__image_buffer__palette returns the palette that the pixel data // can index. The backing array is inside b and has length 1024. -static inline uint8_t* wuffs_base__image_buffer__palette( +static inline wuffs_base__slice_u8 wuffs_base__image_buffer__palette( wuffs_base__image_buffer* b) { - return b ? b->private_impl.palette : NULL; + return b ? ((wuffs_base__slice_u8){.ptr = b->private_impl.palette, + .len = 1024}) + : ((wuffs_base__slice_u8){}); } static inline wuffs_base__table_u8 wuffs_base__image_buffer__plane( diff --git a/gen/h/std/gif.h b/gen/h/std/gif.h index e6298528..42f48f35 100644 --- a/gen/h/std/gif.h +++ b/gen/h/std/gif.h @@ -1148,9 +1148,11 @@ static inline wuffs_base__flicks wuffs_base__image_buffer__duration( // wuffs_base__image_buffer__palette returns the palette that the pixel data // can index. The backing array is inside b and has length 1024. -static inline uint8_t* wuffs_base__image_buffer__palette( +static inline wuffs_base__slice_u8 wuffs_base__image_buffer__palette( wuffs_base__image_buffer* b) { - return b ? b->private_impl.palette : NULL; + return b ? ((wuffs_base__slice_u8){.ptr = b->private_impl.palette, + .len = 1024}) + : ((wuffs_base__slice_u8){}); } static inline wuffs_base__table_u8 wuffs_base__image_buffer__plane( diff --git a/gen/h/std/gzip.h b/gen/h/std/gzip.h index 0e88108b..314b48c3 100644 --- a/gen/h/std/gzip.h +++ b/gen/h/std/gzip.h @@ -1148,9 +1148,11 @@ static inline wuffs_base__flicks wuffs_base__image_buffer__duration( // wuffs_base__image_buffer__palette returns the palette that the pixel data // can index. The backing array is inside b and has length 1024. -static inline uint8_t* wuffs_base__image_buffer__palette( +static inline wuffs_base__slice_u8 wuffs_base__image_buffer__palette( wuffs_base__image_buffer* b) { - return b ? b->private_impl.palette : NULL; + return b ? ((wuffs_base__slice_u8){.ptr = b->private_impl.palette, + .len = 1024}) + : ((wuffs_base__slice_u8){}); } static inline wuffs_base__table_u8 wuffs_base__image_buffer__plane( diff --git a/gen/h/std/zlib.h b/gen/h/std/zlib.h index 39c10db6..4ddaf886 100644 --- a/gen/h/std/zlib.h +++ b/gen/h/std/zlib.h @@ -1148,9 +1148,11 @@ static inline wuffs_base__flicks wuffs_base__image_buffer__duration( // wuffs_base__image_buffer__palette returns the palette that the pixel data // can index. The backing array is inside b and has length 1024. -static inline uint8_t* wuffs_base__image_buffer__palette( +static inline wuffs_base__slice_u8 wuffs_base__image_buffer__palette( wuffs_base__image_buffer* b) { - return b ? b->private_impl.palette : NULL; + return b ? ((wuffs_base__slice_u8){.ptr = b->private_impl.palette, + .len = 1024}) + : ((wuffs_base__slice_u8){}); } static inline wuffs_base__table_u8 wuffs_base__image_buffer__plane( diff --git a/test/c/std/gif.c b/test/c/std/gif.c index 7b4a58d2..cac6081e 100644 --- a/test/c/std/gif.c +++ b/test/c/std/gif.c @@ -495,12 +495,12 @@ bool do_test_wuffs_gif_decode(const char* filename, } } - // TODO: provide a public API for getting the palette. - wuffs_base__io_buffer pal_got = {.ptr = dec.private_impl.f_palettes[0], - .len = 4 * 256}; + wuffs_base__slice_u8 pal_got_slice = wuffs_base__image_buffer__palette(&ib); + wuffs_base__io_buffer pal_got = {.ptr = pal_got_slice.ptr, + .len = pal_got_slice.len, + .wi = pal_got_slice.len}; wuffs_base__io_buffer pal_want = {.ptr = global_palette_buffer, .len = 4 * 256}; - pal_got.wi = 4 * 256; if (!read_file(&pal_want, palette_filename)) { return false; }