Fix decoding GIFs to an image (not IO) buffer

This commit is contained in:
Nigel Tao committed 2018-05-28 14:06:58 +10:00
1 parent 70c24330fd
commit e1293c2522
5 files changed
+154 -34

No files matched your search

+37 -3
View File
@@ -355,6 +355,9 @@ void bench_wuffs_lzw_decode_100k() {
// ---------------- GIF Tests
// TODO: delete this.
const bool write_to_ib_instead_of_w = false;
const char* wuffs_gif_decode(wuffs_base__io_buffer* dst,
wuffs_base__io_buffer* src) {
wuffs_gif__decoder dec;
@@ -370,7 +373,11 @@ const char* wuffs_gif_decode(wuffs_base__io_buffer* dst,
}
// TODO: check wuffs_base__image_buffer__set_from_slice errors?
wuffs_base__image_buffer__set_from_slice(
&ib, ic, wuffs_base__io_buffer__writable(dst));
&ib, ic,
((wuffs_base__slice_u8){
.ptr = global_pixel_buffer,
.len = WUFFS_TESTLIB_ARRAY_SIZE(global_pixel_buffer),
}));
while (true) {
s = wuffs_gif__decoder__decode_frame(&dec, &ib, dst_writer, src_reader);
if (s == WUFFS_GIF__SUSPENSION_END_OF_DATA) {
@@ -379,6 +386,12 @@ const char* wuffs_gif_decode(wuffs_base__io_buffer* dst,
if (s) {
return wuffs_gif__status__string(s);
}
if (write_to_ib_instead_of_w) {
const char* msg = copy_to_io_buffer_from_image_buffer(dst, &ib);
if (msg) {
return msg;
}
}
}
return NULL;
}
@@ -435,7 +448,11 @@ bool do_test_wuffs_gif_decode(const char* filename,
}
// TODO: check wuffs_base__image_buffer__set_from_slice errors?
wuffs_base__image_buffer__set_from_slice(
&ib, ic, wuffs_base__io_buffer__writable(&got));
&ib, ic,
((wuffs_base__slice_u8){
.ptr = global_pixel_buffer,
.len = WUFFS_TESTLIB_ARRAY_SIZE(global_pixel_buffer),
}));
}
int num_iters = 0;
@@ -455,6 +472,13 @@ bool do_test_wuffs_gif_decode(const char* filename,
wuffs_gif__status status =
wuffs_gif__decoder__decode_frame(&dec, &ib, got_writer, src_reader);
if (status == WUFFS_GIF__STATUS_OK) {
if (write_to_ib_instead_of_w) {
const char* msg = copy_to_io_buffer_from_image_buffer(&got, &ib);
if (msg) {
FAIL("%s", msg);
return false;
}
}
break;
}
if ((status != WUFFS_GIF__SUSPENSION_SHORT_READ) &&
@@ -604,7 +628,11 @@ bool do_test_wuffs_gif_decode_animated(
}
// TODO: check wuffs_base__image_buffer__set_from_slice errors?
wuffs_base__image_buffer__set_from_slice(
&ib, ic, wuffs_base__io_buffer__writable(&got));
&ib, ic,
((wuffs_base__slice_u8){
.ptr = global_pixel_buffer,
.len = WUFFS_TESTLIB_ARRAY_SIZE(global_pixel_buffer),
}));
uint32_t i;
for (i = 0; i < want_num_frames; i++) {
@@ -800,6 +828,11 @@ bool do_test_mimic_gif_decode(const char* filename) {
return true;
}
void test_mimic_gif_decode_animated_small() {
CHECK_FOCUS(__func__);
do_test_mimic_gif_decode("../../data/animated-red-blue.gif");
}
void test_mimic_gif_decode_bricks_dither() {
CHECK_FOCUS(__func__);
do_test_mimic_gif_decode("../../data/bricks-dither.gif");
@@ -969,6 +1002,7 @@ proc tests[] = {
#ifdef WUFFS_MIMIC
test_mimic_gif_decode_animated_small, //
test_mimic_gif_decode_bricks_dither, //
test_mimic_gif_decode_bricks_gray, //
test_mimic_gif_decode_bricks_nodither, //
+29 -2
View File
@@ -27,6 +27,7 @@
uint8_t global_got_buffer[BUFFER_SIZE];
uint8_t global_want_buffer[BUFFER_SIZE];
uint8_t global_src_buffer[BUFFER_SIZE];
uint8_t global_pixel_buffer[BUFFER_SIZE];
uint8_t global_palette_buffer[PALETTE_BUFFER_SIZE];
char fail_msg[65536] = {0};
@@ -330,6 +331,31 @@ void set_writer_limit(wuffs_base__io_writer* o, uint64_t limit) {
}
}
const char* copy_to_io_buffer_from_image_buffer(wuffs_base__io_buffer* dst,
wuffs_base__image_buffer* src) {
// TODO: don't assume 1 plane or WUFFS_BASE__PIXEL_SUBSAMPLING__NONE.
uint32_t p;
for (p = 0; p < 1; p++) {
wuffs_base__table_u8 tab = wuffs_base__image_buffer__plane(src, p);
wuffs_base__rect_ie_u32 r = wuffs_base__image_buffer__dirty_rect(src);
uint32_t y;
for (y = r.min_inclusive_y; y < r.max_exclusive_y; y++) {
wuffs_base__slice_u8 row = wuffs_base__table_u8__row(tab, y);
if ((r.min_inclusive_x >= r.max_exclusive_x) ||
(r.max_exclusive_x > row.len)) {
break;
}
uint32_t n = r.max_exclusive_x - r.min_inclusive_x;
if (n > (dst->len - dst->wi)) {
return "copy_to_io_buffer_from_image_buffer: dst buffer is too small";
}
memmove(dst->ptr + dst->wi, row.ptr + r.min_inclusive_x, n);
dst->wi += n;
}
}
return NULL;
}
bool read_file(wuffs_base__io_buffer* dst, const char* path) {
if (!dst || !path) {
FAIL("read_file: NULL argument");
@@ -444,7 +470,8 @@ bool io_buffers_equal(const char* prefix,
}
char* msg = fail_msg;
size_t i;
for (i = 0; (i < got->wi) && (i < want->wi); i++) {
size_t n = got->wi < want->wi ? got->wi : want->wi;
for (i = 0; i < n; i++) {
if (got->ptr[i] != want->ptr[i]) {
break;
}
@@ -453,7 +480,7 @@ bool io_buffers_equal(const char* prefix,
INCR_FAIL(msg, "%sio_buffers_equal: wi: got %zu, want %zu.\n", prefix,
got->wi, want->wi);
} else if (i < got->wi) {
INCR_FAIL(msg, "%sio_buffers_equal:\n", prefix);
INCR_FAIL(msg, "%sio_buffers_equal: wi=%zu:\n", prefix, n);
} else {
return true;
}