Add an end of data concept

This commit is contained in:
Nigel Tao committed 2018-02-10 12:13:26 +11:00
1 parent bde5a6d39e
commit d3770b9972
9 files changed
+57 -14

No files matched your search

+4 -2
View File
@@ -210,6 +210,7 @@ typedef int32_t wuffs_deflate__status;
#define WUFFS_DEFLATE__ERROR_CANNOT_RETURN_A_SUSPENSION \
-2147483638 // 0x8000000A
#define WUFFS_DEFLATE__ERROR_INVALID_CALL_SEQUENCE -2147483637 // 0x8000000B
#define WUFFS_DEFLATE__SUSPENSION_END_OF_DATA 12 // 0x0000000C
#define WUFFS_DEFLATE__ERROR_BAD_HUFFMAN_CODE_OVER_SUBSCRIBED \
-1278585856 // 0xB3CA5400
@@ -694,7 +695,7 @@ static inline wuffs_base__empty_struct wuffs_base__writer1__mark(
return ((wuffs_base__empty_struct){});
}
static const char* wuffs_base__status__strings[12] = {
static const char* wuffs_base__status__strings[13] = {
"ok",
"bad wuffs version",
"bad receiver",
@@ -707,6 +708,7 @@ static const char* wuffs_base__status__strings[12] = {
"short write",
"cannot return a suspension",
"invalid call sequence",
"end of data",
};
#endif // WUFFS_BASE_IMPL_H
@@ -743,7 +745,7 @@ const char* wuffs_deflate__status__string(wuffs_deflate__status s) {
switch ((s >> 10) & 0x1FFFFF) {
case 0:
a = wuffs_base__status__strings;
n = 12;
n = 13;
break;
case wuffs_deflate__packageid:
a = wuffs_deflate__status__strings;
+11 -3
View File
@@ -209,6 +209,7 @@ typedef int32_t wuffs_gif__status;
#define WUFFS_GIF__SUSPENSION_SHORT_WRITE 9 // 0x00000009
#define WUFFS_GIF__ERROR_CANNOT_RETURN_A_SUSPENSION -2147483638 // 0x8000000A
#define WUFFS_GIF__ERROR_INVALID_CALL_SEQUENCE -2147483637 // 0x8000000B
#define WUFFS_GIF__SUSPENSION_END_OF_DATA 12 // 0x0000000C
#define WUFFS_GIF__ERROR_BAD_GIF_BLOCK -1105848320 // 0xBE161800
#define WUFFS_GIF__ERROR_BAD_GIF_EXTENSION_LABEL -1105848319 // 0xBE161801
@@ -691,7 +692,7 @@ static inline wuffs_base__empty_struct wuffs_base__writer1__mark(
return ((wuffs_base__empty_struct){});
}
static const char* wuffs_base__status__strings[12] = {
static const char* wuffs_base__status__strings[13] = {
"ok",
"bad wuffs version",
"bad receiver",
@@ -704,6 +705,7 @@ static const char* wuffs_base__status__strings[12] = {
"short write",
"cannot return a suspension",
"invalid call sequence",
"end of data",
};
#endif // WUFFS_BASE_IMPL_H
@@ -731,7 +733,7 @@ const char* wuffs_gif__status__string(wuffs_gif__status s) {
switch ((s >> 10) & 0x1FFFFF) {
case 0:
a = wuffs_base__status__strings;
n = 12;
n = 13;
break;
case wuffs_gif__packageid:
a = wuffs_gif__status__strings;
@@ -967,14 +969,20 @@ wuffs_gif__status wuffs_gif__decoder__decode_frame(wuffs_gif__decoder* self,
if (status) {
goto suspend;
}
} else if (v_c == 59) {
status = WUFFS_GIF__STATUS_OK;
goto ok;
} else if (v_c == 59) {
goto label_0_break;
} else {
status = WUFFS_GIF__ERROR_BAD_GIF_BLOCK;
goto exit;
}
}
label_0_break:;
while (true) {
status = WUFFS_GIF__SUSPENSION_END_OF_DATA;
WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(4);
}
goto ok;
ok:
+5 -2
View File
@@ -219,6 +219,7 @@ typedef int32_t wuffs_deflate__status;
#define WUFFS_DEFLATE__ERROR_CANNOT_RETURN_A_SUSPENSION \
-2147483638 // 0x8000000A
#define WUFFS_DEFLATE__ERROR_INVALID_CALL_SEQUENCE -2147483637 // 0x8000000B
#define WUFFS_DEFLATE__SUSPENSION_END_OF_DATA 12 // 0x0000000C
#define WUFFS_DEFLATE__ERROR_BAD_HUFFMAN_CODE_OVER_SUBSCRIBED \
-1278585856 // 0xB3CA5400
@@ -390,6 +391,7 @@ typedef int32_t wuffs_zlib__status;
#define WUFFS_ZLIB__SUSPENSION_SHORT_WRITE 9 // 0x00000009
#define WUFFS_ZLIB__ERROR_CANNOT_RETURN_A_SUSPENSION -2147483638 // 0x8000000A
#define WUFFS_ZLIB__ERROR_INVALID_CALL_SEQUENCE -2147483637 // 0x8000000B
#define WUFFS_ZLIB__SUSPENSION_END_OF_DATA 12 // 0x0000000C
#define WUFFS_ZLIB__ERROR_CHECKSUM_MISMATCH -33692672 // 0xFDFDE400
#define WUFFS_ZLIB__ERROR_INVALID_ZLIB_COMPRESSION_METHOD \
@@ -818,7 +820,7 @@ static inline wuffs_base__empty_struct wuffs_base__writer1__mark(
return ((wuffs_base__empty_struct){});
}
static const char* wuffs_base__status__strings[12] = {
static const char* wuffs_base__status__strings[13] = {
"ok",
"bad wuffs version",
"bad receiver",
@@ -831,6 +833,7 @@ static const char* wuffs_base__status__strings[12] = {
"short write",
"cannot return a suspension",
"invalid call sequence",
"end of data",
};
#endif // WUFFS_BASE_IMPL_H
@@ -855,7 +858,7 @@ const char* wuffs_zlib__status__string(wuffs_zlib__status s) {
switch ((s >> 10) & 0x1FFFFF) {
case 0:
a = wuffs_base__status__strings;
n = 12;
n = 13;
break;
case wuffs_zlib__packageid:
a = wuffs_zlib__status__strings;
+1
View File
@@ -210,6 +210,7 @@ typedef int32_t wuffs_deflate__status;
#define WUFFS_DEFLATE__ERROR_CANNOT_RETURN_A_SUSPENSION \
-2147483638 // 0x8000000A
#define WUFFS_DEFLATE__ERROR_INVALID_CALL_SEQUENCE -2147483637 // 0x8000000B
#define WUFFS_DEFLATE__SUSPENSION_END_OF_DATA 12 // 0x0000000C
#define WUFFS_DEFLATE__ERROR_BAD_HUFFMAN_CODE_OVER_SUBSCRIBED \
-1278585856 // 0xB3CA5400
+1
View File
@@ -209,6 +209,7 @@ typedef int32_t wuffs_gif__status;
#define WUFFS_GIF__SUSPENSION_SHORT_WRITE 9 // 0x00000009
#define WUFFS_GIF__ERROR_CANNOT_RETURN_A_SUSPENSION -2147483638 // 0x8000000A
#define WUFFS_GIF__ERROR_INVALID_CALL_SEQUENCE -2147483637 // 0x8000000B
#define WUFFS_GIF__SUSPENSION_END_OF_DATA 12 // 0x0000000C
#define WUFFS_GIF__ERROR_BAD_GIF_BLOCK -1105848320 // 0xBE161800
#define WUFFS_GIF__ERROR_BAD_GIF_EXTENSION_LABEL -1105848319 // 0xBE161801
+2
View File
@@ -219,6 +219,7 @@ typedef int32_t wuffs_deflate__status;
#define WUFFS_DEFLATE__ERROR_CANNOT_RETURN_A_SUSPENSION \
-2147483638 // 0x8000000A
#define WUFFS_DEFLATE__ERROR_INVALID_CALL_SEQUENCE -2147483637 // 0x8000000B
#define WUFFS_DEFLATE__SUSPENSION_END_OF_DATA 12 // 0x0000000C
#define WUFFS_DEFLATE__ERROR_BAD_HUFFMAN_CODE_OVER_SUBSCRIBED \
-1278585856 // 0xB3CA5400
@@ -390,6 +391,7 @@ typedef int32_t wuffs_zlib__status;
#define WUFFS_ZLIB__SUSPENSION_SHORT_WRITE 9 // 0x00000009
#define WUFFS_ZLIB__ERROR_CANNOT_RETURN_A_SUSPENSION -2147483638 // 0x8000000A
#define WUFFS_ZLIB__ERROR_INVALID_CALL_SEQUENCE -2147483637 // 0x8000000B
#define WUFFS_ZLIB__SUSPENSION_END_OF_DATA 12 // 0x0000000C
#define WUFFS_ZLIB__ERROR_CHECKSUM_MISMATCH -33692672 // 0xFDFDE400
#define WUFFS_ZLIB__ERROR_INVALID_ZLIB_COMPRESSION_METHOD \
+1
View File
@@ -49,6 +49,7 @@ var StatusList = [...]Status{
{t.IDSuspension, "short write"},
{t.IDError, "cannot return a suspension"},
{t.IDError, "invalid call sequence"},
{t.IDSuspension, "end of data"},
}
var StatusMap = map[string]Status{}
+5 -1
View File
@@ -69,12 +69,16 @@ pub func decoder.decode_frame?(dst writer1, src reader1)() {
//
// TODO: reset this.lzw if it's not the first ID.
this.decode_id?(dst:in.dst, src:in.src)
} else if c == 0x3B { // The spec calls 0x3B the "Trailer".
return
} else if c == 0x3B { // The spec calls 0x3B the "Trailer".
break
} else {
return error "bad GIF block"
}
}
while true {
yield suspension "end of data"
}
}
// decode_header reads either "GIF87a" or "GIF89a".
+27 -6
View File
@@ -228,7 +228,7 @@ bool do_test_wuffs_lzw_decode(const char* src_filename,
wuffs_gif__lzw_decoder__decode(&dec, got_writer, src_reader);
if (status == WUFFS_GIF__STATUS_OK) {
if (src.ri != src.wi) {
FAIL("decode returned ok but src was not exhausted");
FAIL("decode returned \"ok\" but src was not exhausted");
return false;
}
break;
@@ -435,10 +435,6 @@ bool do_test_wuffs_gif_decode(const char* filename,
wuffs_gif__status status =
wuffs_gif__decoder__decode_frame(&dec, got_writer, src_reader);
if (status == WUFFS_GIF__STATUS_OK) {
if (src.ri != src.wi) {
FAIL("decode returned ok but src was not exhausted");
return false;
}
break;
}
if ((status != WUFFS_GIF__SUSPENSION_SHORT_READ) &&
@@ -494,7 +490,32 @@ bool do_test_wuffs_gif_decode(const char* filename,
if (!read_file(&ind_want, indexes_filename)) {
return false;
}
return buf1s_equal("indexes ", &got, &ind_want);
if (!buf1s_equal("indexes ", &got, &ind_want)) {
return false;
}
{
if (src.ri == src.wi) {
FAIL("decode_config returned \"ok\" but src was exhausted");
return false;
}
wuffs_base__writer1 got_writer = {.buf = &got};
wuffs_base__reader1 src_reader = {.buf = &src};
wuffs_gif__status status =
wuffs_gif__decoder__decode_frame(&dec, got_writer, src_reader);
if (status != WUFFS_GIF__SUSPENSION_END_OF_DATA) {
FAIL("status: got %" PRIi32 " (%s), want %" PRIi32 " (%s)", status,
wuffs_gif__status__string(status), WUFFS_GIF__SUSPENSION_END_OF_DATA,
wuffs_gif__status__string(WUFFS_GIF__SUSPENSION_END_OF_DATA));
return false;
}
if (src.ri != src.wi) {
FAIL("decode_config returned \"end of data\" but src was not exhausted");
return false;
}
}
return true;
}
void test_wuffs_gif_call_sequence() {