diff --git a/test/c/testlib/testlib.c b/test/c/testlib/testlib.c index e7dc6e4c..713b95ea 100644 --- a/test/c/testlib/testlib.c +++ b/test/c/testlib/testlib.c @@ -20,16 +20,18 @@ #include #include -#define BUFFER_SIZE (64 * 1024 * 1024) +#define IO_BUFFER_SIZE (64 * 1024 * 1024) +#define PIXEL_BUFFER_SIZE (64 * 1024 * 1024) #define TOKEN_BUFFER_SIZE (128 * 1024) #define WUFFS_TESTLIB_ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0])) -uint8_t global_have_array[BUFFER_SIZE]; -uint8_t global_want_array[BUFFER_SIZE]; -uint8_t global_work_array[BUFFER_SIZE]; -uint8_t global_src_array[BUFFER_SIZE]; -uint8_t global_pixel_array[BUFFER_SIZE]; +uint8_t global_have_array[IO_BUFFER_SIZE]; +uint8_t global_want_array[IO_BUFFER_SIZE]; +uint8_t global_work_array[IO_BUFFER_SIZE]; +uint8_t global_src_array[IO_BUFFER_SIZE]; + +uint8_t global_pixel_array[PIXEL_BUFFER_SIZE]; wuffs_base__token global_have_token_array[TOKEN_BUFFER_SIZE]; wuffs_base__token global_want_token_array[TOKEN_BUFFER_SIZE]; @@ -38,6 +40,7 @@ wuffs_base__slice_u8 global_have_slice; wuffs_base__slice_u8 global_want_slice; wuffs_base__slice_u8 global_work_slice; wuffs_base__slice_u8 global_src_slice; + wuffs_base__slice_u8 global_pixel_slice; wuffs_base__slice_token global_have_token_slice; @@ -46,23 +49,23 @@ wuffs_base__slice_token global_want_token_slice; void wuffs_testlib__initialize_global_xxx_slices() { global_have_slice = ((wuffs_base__slice_u8){ .ptr = global_have_array, - .len = BUFFER_SIZE, + .len = IO_BUFFER_SIZE, }); global_want_slice = ((wuffs_base__slice_u8){ .ptr = global_want_array, - .len = BUFFER_SIZE, + .len = IO_BUFFER_SIZE, }); global_work_slice = ((wuffs_base__slice_u8){ .ptr = global_work_array, - .len = BUFFER_SIZE, + .len = IO_BUFFER_SIZE, }); global_src_slice = ((wuffs_base__slice_u8){ .ptr = global_src_array, - .len = BUFFER_SIZE, + .len = IO_BUFFER_SIZE, }); global_pixel_slice = ((wuffs_base__slice_u8){ .ptr = global_pixel_array, - .len = BUFFER_SIZE, + .len = PIXEL_BUFFER_SIZE, }); global_have_token_slice = ((wuffs_base__slice_token){ @@ -961,7 +964,7 @@ do_test__wuffs_base__image_decoder( uint32_t want_height, wuffs_base__color_u32_argb_premul want_final_pixel) { if ((want_width > 16384) || (want_height > 16384) || - ((want_width * want_height * 4) > BUFFER_SIZE)) { + ((want_width * want_height * 4) > PIXEL_BUFFER_SIZE)) { return "want dimensions are too large"; } @@ -997,7 +1000,7 @@ do_test__wuffs_base__image_decoder( uint64_t n = wuffs_base__pixel_config__pixbuf_len(&ic.pixcfg); if (n < 4) { RETURN_FAIL("pixbuf_len too small"); - } else if (n > BUFFER_SIZE) { + } else if (n > PIXEL_BUFFER_SIZE) { RETURN_FAIL("pixbuf_len too large"); } else { wuffs_base__color_u32_argb_premul have_final_pixel = @@ -1027,7 +1030,7 @@ do_test__wuffs_base__io_transformer(wuffs_base__io_transformer* b, size_t src_wi, size_t want_wi, uint8_t want_final_byte) { - if (want_wi > BUFFER_SIZE) { + if (want_wi > IO_BUFFER_SIZE) { return "want_wi is too large"; } wuffs_base__range_ii_u64 workbuf_len = @@ -1035,7 +1038,7 @@ do_test__wuffs_base__io_transformer(wuffs_base__io_transformer* b, if (workbuf_len.min_incl > workbuf_len.max_incl) { return "inconsistent workbuf_len"; } - if (workbuf_len.max_incl > BUFFER_SIZE) { + if (workbuf_len.max_incl > IO_BUFFER_SIZE) { return "workbuf_len is too large"; }