From 3df168ed9db98da1de4113cc3aeffca5e48b8532 Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Sun, 15 Jul 2018 17:40:28 +1000 Subject: [PATCH] Have std/gif's decode_frame call decode_config --- example/gifplayer/gifplayer.c | 58 +++++++++++++++----------------- lang/check/type.go | 4 ++- release/c/unsupported-snapshot.h | 13 ++++--- std/gif/decode_gif.wuffs | 2 +- test/c/std/gif.c | 15 ++++++--- 5 files changed, 51 insertions(+), 41 deletions(-) diff --git a/example/gifplayer/gifplayer.c b/example/gifplayer/gifplayer.c index bafc71d3..753a3aa1 100644 --- a/example/gifplayer/gifplayer.c +++ b/example/gifplayer/gifplayer.c @@ -87,8 +87,10 @@ size_t image_len = 0; uint8_t* print_buffer = NULL; size_t print_len = 0; -bool seen_num_loops = false; +bool first_play = true; uint32_t num_loops_remaining = 0; +wuffs_base__image_buffer ib = ((wuffs_base__image_buffer){}); +wuffs_base__image_config ic = ((wuffs_base__image_config){}); wuffs_base__flicks cumulative_delay_micros = 0; @@ -276,38 +278,34 @@ const char* play() { .ptr = src_buffer, .len = src_len, .wi = src_len, .closed = true}); wuffs_base__io_reader src_reader = wuffs_base__io_buffer__reader(&src); - wuffs_base__image_buffer ib = ((wuffs_base__image_buffer){}); - wuffs_base__image_config ic = ((wuffs_base__image_config){}); - wuffs_base__status s = - wuffs_gif__decoder__decode_config(&dec, &ic, src_reader); - if (s) { - return wuffs_gif__status__string(s); - } - if (!wuffs_base__image_config__is_valid(&ic)) { - return "invalid image configuration"; - } - uint32_t width = wuffs_base__image_config__width(&ic); - uint32_t height = wuffs_base__image_config__height(&ic); - if ((width > MAX_DIMENSION) || (height > MAX_DIMENSION)) { - return "image dimensions are too large"; - } - if (!image_buffer) { + if (first_play) { + first_play = false; + wuffs_base__status s = + wuffs_gif__decoder__decode_config(&dec, &ic, src_reader); + if (s) { + return wuffs_gif__status__string(s); + } + if (!wuffs_base__image_config__is_valid(&ic)) { + return "invalid image configuration"; + } + uint32_t width = wuffs_base__image_config__width(&ic); + uint32_t height = wuffs_base__image_config__height(&ic); + if ((width > MAX_DIMENSION) || (height > MAX_DIMENSION)) { + return "image dimensions are too large"; + } const char* msg = allocate(&ic); if (msg) { return msg; } - } - memset(image_buffer, 0, image_len); - s = wuffs_base__image_buffer__set_from_slice( - &ib, ic, ((wuffs_base__slice_u8){.ptr = image_buffer, .len = image_len})); - if (s) { - return wuffs_gif__status__string(s); - } - - if (!seen_num_loops) { - seen_num_loops = true; - num_loops_remaining = wuffs_base__image_config__num_loops(&ic); + s = wuffs_base__image_buffer__set_from_slice( + &ib, ic, + ((wuffs_base__slice_u8){.ptr = image_buffer, .len = image_len})); + if (s) { + return wuffs_gif__status__string(s); + } + memset(image_buffer, 0, image_len); memset(dst_buffer, 0, dst_len); + num_loops_remaining = wuffs_base__image_config__num_loops(&ic); } while (1) { @@ -315,8 +313,8 @@ const char* play() { // upcoming frame is WUFFS_BASE__ANIMATION_DISPOSAL__RESTORE_PREVIOUS. memcpy(prev_dst_buffer, dst_buffer, dst_len); - s = wuffs_gif__decoder__decode_frame(&dec, &ib, src_reader, - ((wuffs_base__slice_u8){})); + wuffs_base__status s = wuffs_gif__decoder__decode_frame( + &dec, &ib, src_reader, ((wuffs_base__slice_u8){})); if (s) { if (s == WUFFS_BASE__SUSPENSION_END_OF_DATA) { break; diff --git a/lang/check/type.go b/lang/check/type.go index 1cb88e19..2590831f 100644 --- a/lang/check/type.go +++ b/lang/check/type.go @@ -263,7 +263,9 @@ func (q *checker) tcheckAssert(n *a.Assert) error { } func (q *checker) tcheckEq(lID t.ID, lhs *a.Expr, lTyp *a.TypeExpr, rhs *a.Expr, rTyp *a.TypeExpr) error { - if (rTyp.IsIdeal() && lTyp.IsNumType()) || lTyp.EqIgnoringRefinements(rTyp) { + if (rTyp.IsIdeal() && lTyp.IsNumType()) || + (rTyp.EqIgnoringRefinements(lTyp)) || + (rTyp.IsNullptr() && lTyp.Decorator() == t.IDNptr) { return nil } lStr := "???" diff --git a/release/c/unsupported-snapshot.h b/release/c/unsupported-snapshot.h index 31e0a919..7fd953be 100644 --- a/release/c/unsupported-snapshot.h +++ b/release/c/unsupported-snapshot.h @@ -6663,14 +6663,17 @@ wuffs_gif__decoder__decode_frame(wuffs_gif__decoder* self, WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0; if (self->private_impl.f_call_sequence == 0) { - status = WUFFS_BASE__ERROR_INVALID_CALL_SEQUENCE; - goto exit; + WUFFS_BASE__COROUTINE_SUSPENSION_POINT(1); + status = wuffs_gif__decoder__decode_config(self, NULL, a_src); + if (status) { + goto suspend; + } } if (!self->private_impl.f_end_of_data) { if (self->private_impl.f_call_sequence == 1) { self->private_impl.f_call_sequence = 2; } else { - WUFFS_BASE__COROUTINE_SUSPENSION_POINT(1); + WUFFS_BASE__COROUTINE_SUSPENSION_POINT(2); status = wuffs_gif__decoder__decode_up_to_id_part1(self, a_src); if (status) { goto suspend; @@ -6680,10 +6683,10 @@ wuffs_gif__decoder__decode_frame(wuffs_gif__decoder* self, if (self->private_impl.f_end_of_data) { while (true) { status = WUFFS_BASE__SUSPENSION_END_OF_DATA; - WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(2); + WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(3); } } - WUFFS_BASE__COROUTINE_SUSPENSION_POINT(3); + WUFFS_BASE__COROUTINE_SUSPENSION_POINT(4); status = wuffs_gif__decoder__decode_id_part1(self, a_dst, a_src); if (status) { goto suspend; diff --git a/std/gif/decode_gif.wuffs b/std/gif/decode_gif.wuffs index 3da0dc4e..8cae1ecd 100644 --- a/std/gif/decode_gif.wuffs +++ b/std/gif/decode_gif.wuffs @@ -148,7 +148,7 @@ pub func decoder.work_buffer_size()(ret base.range_ii_u64) { pub func decoder.decode_frame?(dst ptr base.image_buffer, src base.io_reader, work_buffer slice base.u8)() { if this.call_sequence == 0 { - return error "invalid call sequence" + this.decode_config?(dst:nullptr, src:in.src) } if not this.end_of_data { diff --git a/test/c/std/gif.c b/test/c/std/gif.c index b93f0f94..15fdc1ae 100644 --- a/test/c/std/gif.c +++ b/test/c/std/gif.c @@ -424,13 +424,20 @@ void test_wuffs_gif_call_sequence() { wuffs_gif__decoder dec = ((wuffs_gif__decoder){}); wuffs_gif__decoder__check_wuffs_version(&dec, sizeof dec, WUFFS_VERSION); - wuffs_base__image_buffer ib = ((wuffs_base__image_buffer){}); wuffs_base__io_reader src_reader = wuffs_base__io_buffer__reader(&src); - wuffs_base__status status = wuffs_gif__decoder__decode_frame( - &dec, &ib, src_reader, ((wuffs_base__slice_u8){})); + wuffs_base__status status = + wuffs_gif__decoder__decode_config(&dec, NULL, src_reader); + if (status != WUFFS_BASE__STATUS_OK) { + FAIL("decode_config: got %" PRIi32 " (%s), want %" PRIi32 " (%s)", status, + wuffs_gif__status__string(status), WUFFS_BASE__STATUS_OK, + wuffs_gif__status__string(WUFFS_BASE__STATUS_OK)); + return; + } + + status = wuffs_gif__decoder__decode_config(&dec, NULL, src_reader); if (status != WUFFS_BASE__ERROR_INVALID_CALL_SEQUENCE) { - FAIL("decode_frame: got %" PRIi32 " (%s), want %" PRIi32 " (%s)", status, + FAIL("decode_config: got %" PRIi32 " (%s), want %" PRIi32 " (%s)", status, wuffs_gif__status__string(status), WUFFS_BASE__ERROR_INVALID_CALL_SEQUENCE, wuffs_gif__status__string(WUFFS_BASE__ERROR_INVALID_CALL_SEQUENCE));