From f50e1616774c1fef510c65694dac93afe78f04e6 Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Sun, 2 Feb 2020 20:18:10 +1100 Subject: [PATCH] Add image_config_decoder interface test --- test/c/std/gif.c | 17 +++++++++++++++-- test/c/testlib/testlib.c | 29 +++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+), 2 deletions(-) diff --git a/test/c/std/gif.c b/test/c/std/gif.c index c3b5e177..b0a9b63f 100644 --- a/test/c/std/gif.c +++ b/test/c/std/gif.c @@ -163,7 +163,19 @@ const char* test_basic_sub_struct_initializer() { // ---------------- GIF Tests -const char* test_wuffs_gif_decode_interface() { +const char* test_wuffs_gif_decode_interface_image_config_decoder() { + CHECK_FOCUS(__func__); + wuffs_gif__decoder dec; + CHECK_STATUS("initialize", + wuffs_gif__decoder__initialize( + &dec, sizeof dec, WUFFS_VERSION, + WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED)); + return do_test__wuffs_base__image_config_decoder( + wuffs_gif__decoder__upcast_as__wuffs_base__image_decoder(&dec), + "test/data/animated-red-blue.gif", 0, SIZE_MAX, 4); +} + +const char* test_wuffs_gif_decode_interface_image_decoder() { CHECK_FOCUS(__func__); wuffs_gif__decoder dec; CHECK_STATUS("initialize", @@ -2274,7 +2286,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_decode_interface, // + test_wuffs_gif_decode_interface_image_config_decoder, // + test_wuffs_gif_decode_interface_image_decoder, // test_wuffs_gif_decode_interlaced_truncated, // test_wuffs_gif_decode_metadata_empty, // test_wuffs_gif_decode_metadata_full, // diff --git a/test/c/testlib/testlib.c b/test/c/testlib/testlib.c index 0b766b7d..7c27d6a6 100644 --- a/test/c/testlib/testlib.c +++ b/test/c/testlib/testlib.c @@ -784,6 +784,35 @@ const char* do_test__wuffs_base__hasher_u32(wuffs_base__hasher_u32* b, return NULL; } +const char* do_test__wuffs_base__image_config_decoder( + wuffs_base__image_decoder* b, + const char* src_filename, + size_t src_ri, + size_t src_wi, + uint64_t want_num_frames) { + wuffs_base__io_buffer src = ((wuffs_base__io_buffer){ + .data = global_src_slice, + }); + CHECK_STRING(read_file_fragment(&src, src_filename, src_ri, src_wi)); + + uint64_t got_num_frames; + for (got_num_frames = 0;; got_num_frames++) { + wuffs_base__status status = + wuffs_base__image_decoder__decode_frame_config(b, NULL, &src); + if (status.repr == wuffs_base__note__end_of_data) { + break; + } else if (!wuffs_base__status__is_ok(&status)) { + RETURN_FAIL("decode_frame_config: \"%s\"", status.repr); + } + } + + if (got_num_frames != want_num_frames) { + RETURN_FAIL("num_frames: got %" PRIu64 ", want %" PRIu64, got_num_frames, + want_num_frames); + } + return NULL; +} + const char* do_test__wuffs_base__image_decoder( wuffs_base__image_decoder* b, const char* src_filename,