Add a std/gif decode_frame work_buffer arg

This commit is contained in:
Nigel Tao committed 2018-06-11 08:55:28 +10:00
1 parent 156cea5a70
commit 3d035df908
6 files changed
+23 -15

No files matched your search

+2 -1
View File
@@ -261,7 +261,8 @@ const char* play() {
}
while (1) {
s = wuffs_gif__decoder__decode_frame(&dec, &ib, src_reader);
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;
+2 -1
View File
@@ -80,7 +80,8 @@ const char* fuzz(wuffs_base__io_reader src_reader, uint32_t hash) {
bool seen_ok = false;
while (true) {
s = wuffs_gif__decoder__decode_frame(&dec, &ib, src_reader);
s = wuffs_gif__decoder__decode_frame(&dec, &ib, src_reader,
((wuffs_base__slice_u8){}));
if (s) {
if ((s == WUFFS_BASE__SUSPENSION_END_OF_DATA) && seen_ok) {
s = WUFFS_BASE__STATUS_OK;
+4 -2
View File
@@ -1511,7 +1511,8 @@ wuffs_base__range_ii_u64 wuffs_gif__decoder__work_buffer_size(
wuffs_base__status wuffs_gif__decoder__decode_frame(
wuffs_gif__decoder* self,
wuffs_base__image_buffer* a_dst,
wuffs_base__io_reader a_src);
wuffs_base__io_reader a_src,
wuffs_base__slice_u8 a_work_buffer);
wuffs_base__status wuffs_gif__decoder__decode_up_to_id_part1(
wuffs_gif__decoder* self,
@@ -2347,7 +2348,8 @@ wuffs_base__range_ii_u64 wuffs_gif__decoder__work_buffer_size(
wuffs_base__status wuffs_gif__decoder__decode_frame(
wuffs_gif__decoder* self,
wuffs_base__image_buffer* a_dst,
wuffs_base__io_reader a_src) {
wuffs_base__io_reader a_src,
wuffs_base__slice_u8 a_work_buffer) {
if (!self) {
return WUFFS_BASE__ERROR_BAD_RECEIVER;
}
+2 -1
View File
@@ -1511,7 +1511,8 @@ wuffs_base__range_ii_u64 wuffs_gif__decoder__work_buffer_size(
wuffs_base__status wuffs_gif__decoder__decode_frame(
wuffs_gif__decoder* self,
wuffs_base__image_buffer* a_dst,
wuffs_base__io_reader a_src);
wuffs_base__io_reader a_src,
wuffs_base__slice_u8 a_work_buffer);
wuffs_base__status wuffs_gif__decoder__decode_up_to_id_part1(
wuffs_gif__decoder* self,
+1 -1
View File
@@ -129,7 +129,7 @@ pub func decoder.work_buffer_size()(ret base.range_ii_u64) {
return this.util.make_range_ii_u64(min_inclusive:0, max_inclusive:0)
}
pub func decoder.decode_frame?(dst ptr base.image_buffer, src base.io_reader)() {
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"
}
+12 -9
View File
@@ -212,7 +212,8 @@ const char* wuffs_gif_decode(wuffs_base__io_buffer* dst,
.len = WUFFS_TESTLIB_ARRAY_SIZE(global_pixel_buffer),
}));
while (true) {
s = wuffs_gif__decoder__decode_frame(&dec, &ib, src_reader);
s = wuffs_gif__decoder__decode_frame(&dec, &ib, src_reader,
((wuffs_base__slice_u8){}));
if (s == WUFFS_BASE__SUSPENSION_END_OF_DATA) {
break;
}
@@ -296,8 +297,8 @@ bool do_test_wuffs_gif_decode(const char* filename,
}
size_t old_ri = src.ri;
wuffs_base__status status =
wuffs_gif__decoder__decode_frame(&dec, &ib, src_reader);
wuffs_base__status status = wuffs_gif__decoder__decode_frame(
&dec, &ib, src_reader, ((wuffs_base__slice_u8){}));
if (status == WUFFS_BASE__STATUS_OK) {
const char* msg = copy_to_io_buffer_from_image_buffer(&got, &ib);
@@ -364,8 +365,8 @@ bool do_test_wuffs_gif_decode(const char* filename,
return false;
}
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__status status = wuffs_gif__decoder__decode_frame(
&dec, &ib, src_reader, ((wuffs_base__slice_u8){}));
if (status != WUFFS_BASE__SUSPENSION_END_OF_DATA) {
FAIL("decode_frame: got %" PRIi32 " (%s), want %" PRIi32 " (%s)", status,
wuffs_gif__status__string(status),
@@ -398,8 +399,8 @@ void test_wuffs_gif_call_sequence() {
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__status status = wuffs_gif__decoder__decode_frame(
&dec, &ib, src_reader, ((wuffs_base__slice_u8){}));
if (status != WUFFS_BASE__ERROR_INVALID_CALL_SEQUENCE) {
FAIL("decode_frame: got %" PRIi32 " (%s), want %" PRIi32 " (%s)", status,
wuffs_gif__status__string(status),
@@ -450,7 +451,8 @@ bool do_test_wuffs_gif_decode_animated(
uint32_t i;
for (i = 0; i < want_num_frames; i++) {
status = wuffs_gif__decoder__decode_frame(&dec, &ib, src_reader);
status = wuffs_gif__decoder__decode_frame(&dec, &ib, src_reader,
((wuffs_base__slice_u8){}));
if (status != WUFFS_BASE__STATUS_OK) {
FAIL("decode_frame #%" PRIu32 ": got %" PRIi32 " (%s)", i, status,
wuffs_gif__status__string(status));
@@ -473,7 +475,8 @@ bool do_test_wuffs_gif_decode_animated(
}
// There should be no more frames.
status = wuffs_gif__decoder__decode_frame(&dec, &ib, src_reader);
status = wuffs_gif__decoder__decode_frame(&dec, &ib, src_reader,
((wuffs_base__slice_u8){}));
if (status != WUFFS_BASE__SUSPENSION_END_OF_DATA) {
FAIL("decode_frame: got %" PRIi32 " (%s), want %" PRIi32 " (%s)", status,
wuffs_gif__status__string(status), WUFFS_BASE__SUSPENSION_END_OF_DATA,