From a09e63320d03ea0e7ffe45a8e6f56542c4fab27d Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Mon, 11 Jun 2018 09:11:45 +1000 Subject: [PATCH] Add a std/gif decoder.frame_count method --- gen/c/std/gif.c | 22 ++++++++++++++++++++++ gen/h/std/gif.h | 3 +++ std/gif/decode_gif.wuffs | 7 +++++++ test/c/std/gif.c | 7 +++++++ 4 files changed, 39 insertions(+) diff --git a/gen/c/std/gif.c b/gen/c/std/gif.c index ee358cc1..a1992be5 100644 --- a/gen/c/std/gif.c +++ b/gen/c/std/gif.c @@ -1382,6 +1382,7 @@ typedef struct { uint8_t f_gc_transparent_index; uint8_t f_gc_disposal; uint64_t f_gc_duration; + uint64_t f_frame_count_value; uint32_t f_frame_rect_x0; uint32_t f_frame_rect_y0; uint32_t f_frame_rect_x1; @@ -1479,6 +1480,8 @@ wuffs_base__status wuffs_gif__decoder__decode_config( wuffs_base__image_config* a_dst, wuffs_base__io_reader a_src); +uint64_t wuffs_gif__decoder__frame_count(wuffs_gif__decoder* self); + wuffs_base__range_ii_u64 wuffs_gif__decoder__work_buffer_size( wuffs_gif__decoder* self); @@ -2298,6 +2301,23 @@ exit: return status; } +// -------- func decoder.frame_count + +uint64_t wuffs_gif__decoder__frame_count(wuffs_gif__decoder* self) { + if (!self) { + return 0; + } + if (self->private_impl.magic != WUFFS_BASE__MAGIC) { + self->private_impl.status = + WUFFS_BASE__ERROR_CHECK_WUFFS_VERSION_NOT_CALLED; + } + if (self->private_impl.status < 0) { + return 0; + } + + return self->private_impl.f_frame_count_value; +} + // -------- func decoder.work_buffer_size wuffs_base__range_ii_u64 wuffs_gif__decoder__work_buffer_size( @@ -2374,6 +2394,8 @@ wuffs_base__status wuffs_gif__decoder__decode_frame( if (status) { goto suspend; } + wuffs_base__u64__sat_add_indirect(&self->private_impl.f_frame_count_value, + 1); goto ok; ok: diff --git a/gen/h/std/gif.h b/gen/h/std/gif.h index d7351071..37b73f4b 100644 --- a/gen/h/std/gif.h +++ b/gen/h/std/gif.h @@ -1382,6 +1382,7 @@ typedef struct { uint8_t f_gc_transparent_index; uint8_t f_gc_disposal; uint64_t f_gc_duration; + uint64_t f_frame_count_value; uint32_t f_frame_rect_x0; uint32_t f_frame_rect_y0; uint32_t f_frame_rect_x1; @@ -1479,6 +1480,8 @@ wuffs_base__status wuffs_gif__decoder__decode_config( wuffs_base__image_config* a_dst, wuffs_base__io_reader a_src); +uint64_t wuffs_gif__decoder__frame_count(wuffs_gif__decoder* self); + wuffs_base__range_ii_u64 wuffs_gif__decoder__work_buffer_size( wuffs_gif__decoder* self); diff --git a/std/gif/decode_gif.wuffs b/std/gif/decode_gif.wuffs index 6d1a0fac..c9f0559a 100644 --- a/std/gif/decode_gif.wuffs +++ b/std/gif/decode_gif.wuffs @@ -79,6 +79,8 @@ pub struct decoder?( // There are 7056000 flicks per centisecond. gc_duration base.u64[..0xFFFF * 7056000], + frame_count_value base.u64, + frame_rect_x0 base.u32, frame_rect_y0 base.u32, frame_rect_x1 base.u32, @@ -125,6 +127,10 @@ pub func decoder.decode_config?(dst ptr base.image_config, src base.io_reader)() this.call_sequence = 1 } +pub func decoder.frame_count()(ret base.u64) { + return this.frame_count_value +} + pub func decoder.work_buffer_size()(ret base.range_ii_u64) { return this.util.make_range_ii_u64(min_incl:0, max_incl:0) } @@ -152,6 +158,7 @@ pub func decoder.decode_frame?(dst ptr base.image_buffer, src base.io_reader, wo } this.decode_id_part1?(dst:in.dst, src:in.src) + this.frame_count_value ~sat+= 1 } pub func decoder.decode_up_to_id_part1?(src base.io_reader)() { diff --git a/test/c/std/gif.c b/test/c/std/gif.c index 600c20f9..e069abf1 100644 --- a/test/c/std/gif.c +++ b/test/c/std/gif.c @@ -484,6 +484,13 @@ bool do_test_wuffs_gif_decode_animated( return false; } + uint64_t got_num_frames = wuffs_gif__decoder__frame_count(&dec); + if (got_num_frames != want_num_frames) { + FAIL("frame_count: got %" PRIu64 ", want %" PRIu32, got_num_frames, + want_num_frames); + return false; + } + // TODO: test calling wuffs_base__image_buffer__loop. return true; }