mirror of
https://github.com/ddidderr/wuffs.git
synced 2026-11-18 08:32:11 +01:00
Fix decode_frame_config without decode_frame
This commit is contained in:
1 parent
e3e94476ab
commit
adba763a02
3 files changed
+154
-30
No files matched your search
@@ -2536,7 +2536,8 @@ typedef struct {
|
||||
uint8_t f_gc_transparent_index;
|
||||
uint8_t f_gc_disposal;
|
||||
uint64_t f_gc_duration;
|
||||
uint64_t f_frame_count_value;
|
||||
uint64_t f_num_decoded_frame_configs_value;
|
||||
uint64_t f_num_decoded_frames_value;
|
||||
uint32_t f_frame_rect_x0;
|
||||
uint32_t f_frame_rect_y0;
|
||||
uint32_t f_frame_rect_x1;
|
||||
@@ -2626,7 +2627,8 @@ typedef struct {
|
||||
uint64_t wuffs_version);
|
||||
inline wuffs_base__status decode_image_config(wuffs_base__image_config* a_dst,
|
||||
wuffs_base__io_reader a_src);
|
||||
inline uint64_t frame_count();
|
||||
inline uint64_t num_decoded_frame_configs();
|
||||
inline uint64_t num_decoded_frames();
|
||||
inline wuffs_base__range_ii_u64 work_buffer_size();
|
||||
inline wuffs_base__status decode_frame_config(wuffs_base__frame_config* a_dst,
|
||||
wuffs_base__io_reader a_src);
|
||||
@@ -2658,7 +2660,10 @@ wuffs_gif__decoder__decode_image_config(wuffs_gif__decoder* self,
|
||||
wuffs_base__io_reader a_src);
|
||||
|
||||
WUFFS_BASE__MAYBE_STATIC uint64_t //
|
||||
wuffs_gif__decoder__frame_count(wuffs_gif__decoder* self);
|
||||
wuffs_gif__decoder__num_decoded_frame_configs(wuffs_gif__decoder* self);
|
||||
|
||||
WUFFS_BASE__MAYBE_STATIC uint64_t //
|
||||
wuffs_gif__decoder__num_decoded_frames(wuffs_gif__decoder* self);
|
||||
|
||||
WUFFS_BASE__MAYBE_STATIC wuffs_base__range_ii_u64 //
|
||||
wuffs_gif__decoder__work_buffer_size(wuffs_gif__decoder* self);
|
||||
@@ -2694,8 +2699,13 @@ wuffs_gif__decoder::decode_image_config(wuffs_base__image_config* a_dst,
|
||||
}
|
||||
|
||||
inline uint64_t //
|
||||
wuffs_gif__decoder::frame_count() {
|
||||
return wuffs_gif__decoder__frame_count(this);
|
||||
wuffs_gif__decoder::num_decoded_frame_configs() {
|
||||
return wuffs_gif__decoder__num_decoded_frame_configs(this);
|
||||
}
|
||||
|
||||
inline uint64_t //
|
||||
wuffs_gif__decoder::num_decoded_frames() {
|
||||
return wuffs_gif__decoder__num_decoded_frames(this);
|
||||
}
|
||||
|
||||
inline wuffs_base__range_ii_u64 //
|
||||
@@ -6814,10 +6824,10 @@ exit:
|
||||
return status;
|
||||
}
|
||||
|
||||
// -------- func gif.decoder.frame_count
|
||||
// -------- func gif.decoder.num_decoded_frame_configs
|
||||
|
||||
WUFFS_BASE__MAYBE_STATIC uint64_t //
|
||||
wuffs_gif__decoder__frame_count(wuffs_gif__decoder* self) {
|
||||
wuffs_gif__decoder__num_decoded_frame_configs(wuffs_gif__decoder* self) {
|
||||
if (!self) {
|
||||
return 0;
|
||||
}
|
||||
@@ -6829,7 +6839,25 @@ wuffs_gif__decoder__frame_count(wuffs_gif__decoder* self) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
return self->private_impl.f_frame_count_value;
|
||||
return self->private_impl.f_num_decoded_frame_configs_value;
|
||||
}
|
||||
|
||||
// -------- func gif.decoder.num_decoded_frames
|
||||
|
||||
WUFFS_BASE__MAYBE_STATIC uint64_t //
|
||||
wuffs_gif__decoder__num_decoded_frames(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_num_decoded_frames_value;
|
||||
}
|
||||
|
||||
// -------- func gif.decoder.work_buffer_size
|
||||
@@ -6884,14 +6912,14 @@ wuffs_gif__decoder__decode_frame_config(wuffs_gif__decoder* self,
|
||||
if (status) {
|
||||
goto suspend;
|
||||
}
|
||||
} else if (self->private_impl.f_call_sequence == 1) {
|
||||
} else if (self->private_impl.f_call_sequence == 2) {
|
||||
WUFFS_BASE__COROUTINE_SUSPENSION_POINT(2);
|
||||
status = wuffs_gif__decoder__skip_frame(self, a_src);
|
||||
if (status) {
|
||||
goto suspend;
|
||||
} else if (self->private_impl.f_call_sequence != 1) {
|
||||
if (self->private_impl.f_call_sequence == 2) {
|
||||
WUFFS_BASE__COROUTINE_SUSPENSION_POINT(2);
|
||||
status = wuffs_gif__decoder__skip_frame(self, a_src);
|
||||
if (status) {
|
||||
goto suspend;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
WUFFS_BASE__COROUTINE_SUSPENSION_POINT(3);
|
||||
status = wuffs_gif__decoder__decode_up_to_id_part1(self, a_src);
|
||||
if (status) {
|
||||
@@ -6928,6 +6956,8 @@ wuffs_gif__decoder__decode_frame_config(wuffs_gif__decoder* self,
|
||||
self->private_impl.f_gc_disposal,
|
||||
(self->private_impl.f_which_palette != 2));
|
||||
}
|
||||
wuffs_base__u64__sat_add_indirect(
|
||||
&self->private_impl.f_num_decoded_frame_configs_value, 1);
|
||||
self->private_impl.f_call_sequence = 2;
|
||||
|
||||
goto ok;
|
||||
@@ -7003,8 +7033,8 @@ wuffs_gif__decoder__skip_frame(wuffs_gif__decoder* self,
|
||||
self->private_impl.f_gc_transparent_index = 0;
|
||||
self->private_impl.f_gc_disposal = 0;
|
||||
self->private_impl.f_gc_duration = 0;
|
||||
wuffs_base__u64__sat_add_indirect(&self->private_impl.f_frame_count_value,
|
||||
1);
|
||||
wuffs_base__u64__sat_add_indirect(
|
||||
&self->private_impl.f_num_decoded_frames_value, 1);
|
||||
self->private_impl.f_call_sequence = 3;
|
||||
|
||||
goto ok;
|
||||
@@ -7085,8 +7115,8 @@ wuffs_gif__decoder__decode_frame(wuffs_gif__decoder* self,
|
||||
self->private_impl.f_gc_transparent_index = 0;
|
||||
self->private_impl.f_gc_disposal = 0;
|
||||
self->private_impl.f_gc_duration = 0;
|
||||
wuffs_base__u64__sat_add_indirect(&self->private_impl.f_frame_count_value,
|
||||
1);
|
||||
wuffs_base__u64__sat_add_indirect(
|
||||
&self->private_impl.f_num_decoded_frames_value, 1);
|
||||
self->private_impl.f_call_sequence = 3;
|
||||
|
||||
goto ok;
|
||||
|
||||
+15
-10
@@ -99,7 +99,8 @@ pub struct decoder?(
|
||||
// There are 7056000 flicks per centisecond.
|
||||
gc_duration base.u64[..0xFFFF * 7056000],
|
||||
|
||||
frame_count_value base.u64,
|
||||
num_decoded_frame_configs_value base.u64,
|
||||
num_decoded_frames_value base.u64,
|
||||
|
||||
frame_rect_x0 base.u32,
|
||||
frame_rect_y0 base.u32,
|
||||
@@ -155,8 +156,12 @@ pub func decoder.decode_image_config?(dst nptr base.image_config, src base.io_re
|
||||
this.call_sequence = 1
|
||||
}
|
||||
|
||||
pub func decoder.frame_count()(ret base.u64) {
|
||||
return this.frame_count_value
|
||||
pub func decoder.num_decoded_frame_configs()(ret base.u64) {
|
||||
return this.num_decoded_frame_configs_value
|
||||
}
|
||||
|
||||
pub func decoder.num_decoded_frames()(ret base.u64) {
|
||||
return this.num_decoded_frames_value
|
||||
}
|
||||
|
||||
pub func decoder.work_buffer_size()(ret base.range_ii_u64) {
|
||||
@@ -167,11 +172,10 @@ pub func decoder.decode_frame_config?(dst nptr base.frame_config, src base.io_re
|
||||
if not this.end_of_data {
|
||||
if this.call_sequence == 0 {
|
||||
this.decode_image_config?(dst:nullptr, src:in.src)
|
||||
} else if this.call_sequence == 1 {
|
||||
// No-op.
|
||||
} else if this.call_sequence == 2 {
|
||||
this.skip_frame?(src:in.src)
|
||||
} else {
|
||||
} else if this.call_sequence != 1 {
|
||||
if this.call_sequence == 2 {
|
||||
this.skip_frame?(src:in.src)
|
||||
}
|
||||
this.decode_up_to_id_part1?(src:in.src)
|
||||
}
|
||||
}
|
||||
@@ -207,6 +211,7 @@ pub func decoder.decode_frame_config?(dst nptr base.frame_config, src base.io_re
|
||||
palette_changed:this.which_palette != 2)
|
||||
}
|
||||
|
||||
this.num_decoded_frame_configs_value ~sat+= 1
|
||||
this.call_sequence = 2
|
||||
}
|
||||
|
||||
@@ -222,7 +227,7 @@ pri func decoder.skip_frame?(src base.io_reader)() {
|
||||
this.gc_disposal = 0
|
||||
this.gc_duration = 0
|
||||
|
||||
this.frame_count_value ~sat+= 1
|
||||
this.num_decoded_frames_value ~sat+= 1
|
||||
this.call_sequence = 3
|
||||
}
|
||||
|
||||
@@ -242,7 +247,7 @@ pub func decoder.decode_frame?(dst ptr base.pixel_buffer, src base.io_reader, wo
|
||||
this.gc_disposal = 0
|
||||
this.gc_duration = 0
|
||||
|
||||
this.frame_count_value ~sat+= 1
|
||||
this.num_decoded_frames_value ~sat+= 1
|
||||
this.call_sequence = 3
|
||||
}
|
||||
|
||||
|
||||
+90
-1
@@ -579,7 +579,7 @@ bool do_test_wuffs_gif_decode_animated(
|
||||
return false;
|
||||
}
|
||||
|
||||
uint64_t got_num_frames = wuffs_gif__decoder__frame_count(&dec);
|
||||
uint64_t got_num_frames = wuffs_gif__decoder__num_decoded_frames(&dec);
|
||||
if (got_num_frames != want_num_frames) {
|
||||
FAIL("frame_count: got %" PRIu64 ", want %" PRIu32, got_num_frames,
|
||||
want_num_frames);
|
||||
@@ -711,6 +711,93 @@ void test_wuffs_gif_decode_input_is_a_png() {
|
||||
}
|
||||
}
|
||||
|
||||
bool do_test_wuffs_gif_num_decoded(bool frame_config) {
|
||||
wuffs_base__io_buffer src =
|
||||
((wuffs_base__io_buffer){.ptr = global_src_buffer, .len = BUFFER_SIZE});
|
||||
|
||||
if (!read_file(&src, "../../data/animated-red-blue.gif")) {
|
||||
return false;
|
||||
}
|
||||
|
||||
wuffs_gif__decoder dec = ((wuffs_gif__decoder){});
|
||||
wuffs_gif__decoder__check_wuffs_version(&dec, sizeof dec, WUFFS_VERSION);
|
||||
wuffs_base__io_reader src_reader = wuffs_base__io_buffer__reader(&src);
|
||||
|
||||
wuffs_base__pixel_buffer pb = ((wuffs_base__pixel_buffer){});
|
||||
if (!frame_config) {
|
||||
wuffs_base__image_config ic = ((wuffs_base__image_config){});
|
||||
wuffs_base__status z =
|
||||
wuffs_gif__decoder__decode_image_config(&dec, &ic, src_reader);
|
||||
if (z != WUFFS_BASE__STATUS_OK) {
|
||||
FAIL("decode_image_config: %s", wuffs_gif__status__string(z));
|
||||
return false;
|
||||
}
|
||||
|
||||
z = wuffs_base__pixel_buffer__set_from_slice(
|
||||
&pb, wuffs_base__image_config__pixel_config(&ic),
|
||||
((wuffs_base__slice_u8){
|
||||
.ptr = global_pixel_buffer,
|
||||
.len = WUFFS_TESTLIB_ARRAY_SIZE(global_pixel_buffer),
|
||||
}));
|
||||
if (z) {
|
||||
FAIL("set_from_slice: %s", wuffs_gif__status__string(z));
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
const char* method = frame_config ? "decode_frame_config" : "decode_frame";
|
||||
bool end_of_data = false;
|
||||
uint64_t want = 0;
|
||||
while (true) {
|
||||
uint64_t got =
|
||||
frame_config
|
||||
? (uint64_t)(wuffs_gif__decoder__num_decoded_frame_configs(&dec))
|
||||
: (uint64_t)(wuffs_gif__decoder__num_decoded_frames(&dec));
|
||||
if (got != want) {
|
||||
FAIL("num_%ss: got %" PRIu64 ", want %" PRIu64, method, got, want);
|
||||
return false;
|
||||
}
|
||||
|
||||
if (end_of_data) {
|
||||
break;
|
||||
}
|
||||
|
||||
wuffs_base__status z = 0;
|
||||
if (frame_config) {
|
||||
z = wuffs_gif__decoder__decode_frame_config(&dec, NULL, src_reader);
|
||||
} else {
|
||||
z = wuffs_gif__decoder__decode_frame(&dec, &pb, src_reader,
|
||||
((wuffs_base__slice_u8){}), 0, 0);
|
||||
}
|
||||
|
||||
if (z == WUFFS_BASE__STATUS_OK) {
|
||||
want++;
|
||||
continue;
|
||||
} else if (z == WUFFS_BASE__SUSPENSION_END_OF_DATA) {
|
||||
end_of_data = true;
|
||||
continue;
|
||||
}
|
||||
FAIL("%s: %s", method, wuffs_gif__status__string(z));
|
||||
return false;
|
||||
}
|
||||
|
||||
if (want != 4) {
|
||||
FAIL("%s: got %" PRIu64 ", want 4", method, want);
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
void test_wuffs_gif_num_decoded_frame_configs() {
|
||||
CHECK_FOCUS(__func__);
|
||||
do_test_wuffs_gif_num_decoded(true);
|
||||
}
|
||||
|
||||
void test_wuffs_gif_num_decoded_frames() {
|
||||
CHECK_FOCUS(__func__);
|
||||
do_test_wuffs_gif_num_decoded(false);
|
||||
}
|
||||
|
||||
// ---------------- Mimic Tests
|
||||
|
||||
#ifdef WUFFS_MIMIC
|
||||
@@ -929,6 +1016,8 @@ proc tests[] = {
|
||||
test_wuffs_gif_decode_input_is_a_gif_many_medium_reads, //
|
||||
test_wuffs_gif_decode_input_is_a_gif_many_small_reads, //
|
||||
test_wuffs_gif_decode_input_is_a_png, //
|
||||
test_wuffs_gif_num_decoded_frame_configs, //
|
||||
test_wuffs_gif_num_decoded_frames, //
|
||||
|
||||
#ifdef WUFFS_MIMIC
|
||||
|
||||
|
||||
Reference in new issue
Block a user