mirror of
https://github.com/ddidderr/wuffs.git
synced 2026-11-18 00:32:11 +01:00
Add a std/gif decoder.frame_count method
This commit is contained in:
1 parent
c5b7b7097e
commit
a09e63320d
4 files changed
+39
No files matched your search
@@ -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:
|
||||
|
||||
@@ -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);
|
||||
|
||||
|
||||
@@ -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)() {
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user