Add reader1 and writer1 base types.

This commit is contained in:
Nigel Tao committed 2017-06-18 11:50:34 +10:00
1 parent d16a25806f
commit 17e47fbc1e
11 files changed
+169 -138

No files matched your search

+52 -50
View File
@@ -49,6 +49,16 @@ typedef struct {
bool closed; // No further writes are expected.
} puffs_base_buf1;
typedef struct {
puffs_base_buf1* buf;
// TODO: limits.
} puffs_base_reader1;
typedef struct {
puffs_base_buf1* buf;
// TODO: limits.
} puffs_base_writer1;
#endif // PUFFS_BASE_HEADER_H
#ifdef __cplusplus
@@ -145,15 +155,15 @@ void puffs_gif_decoder_destructor(puffs_gif_decoder* self);
// ---------------- Public Function Prototypes
puffs_gif_status puffs_gif_decoder_decode(puffs_gif_decoder* self,
puffs_base_buf1* a_dst,
puffs_base_buf1* a_src);
puffs_base_writer1 a_dst,
puffs_base_reader1 a_src);
void puffs_gif_lzw_decoder_set_literal_width(puffs_gif_lzw_decoder* self,
uint32_t a_lw);
puffs_gif_status puffs_gif_lzw_decoder_decode(puffs_gif_lzw_decoder* self,
puffs_base_buf1* a_dst,
puffs_base_buf1* a_src);
puffs_base_writer1 a_dst,
puffs_base_reader1 a_src);
#ifdef __cplusplus
} // extern "C"
@@ -210,10 +220,10 @@ const char* puffs_gif_status_string(puffs_gif_status s) {
// ---------------- Private Function Prototypes
puffs_gif_status puffs_gif_decoder_decode_header(puffs_gif_decoder* self,
puffs_base_buf1* a_src);
puffs_base_reader1 a_src);
puffs_gif_status puffs_gif_decoder_decode_lsd(puffs_gif_decoder* self,
puffs_base_buf1* a_src);
puffs_base_reader1 a_src);
// ---------------- Constructor and Destructor Implementations
@@ -282,8 +292,8 @@ void puffs_gif_decoder_destructor(puffs_gif_decoder* self) {
// ---------------- Function Implementations
puffs_gif_status puffs_gif_decoder_decode(puffs_gif_decoder* self,
puffs_base_buf1* a_dst,
puffs_base_buf1* a_src) {
puffs_base_writer1 a_dst,
puffs_base_reader1 a_src) {
if (!self) {
return puffs_gif_error_bad_receiver;
}
@@ -295,10 +305,6 @@ puffs_gif_status puffs_gif_decoder_decode(puffs_gif_decoder* self,
status = puffs_gif_error_constructor_not_called;
goto cleanup0;
}
if (!a_dst || !a_src) {
status = puffs_gif_error_bad_argument;
goto cleanup0;
}
status = puffs_gif_decoder_decode_header(self, a_src);
if (status) {
@@ -315,7 +321,7 @@ cleanup0:
}
puffs_gif_status puffs_gif_decoder_decode_header(puffs_gif_decoder* self,
puffs_base_buf1* a_src) {
puffs_base_reader1 a_src) {
puffs_gif_status status = self->private_impl.status;
uint8_t v_c[6];
@@ -326,12 +332,12 @@ puffs_gif_status puffs_gif_decoder_decode_header(puffs_gif_decoder* self,
};
v_i = 0;
while (v_i < 6) {
if (a_src->ri >= a_src->wi) {
status = a_src->closed ? puffs_gif_error_unexpected_eof
: puffs_gif_status_short_read;
if (a_src.buf->ri >= a_src.buf->wi) {
status = a_src.buf->closed ? puffs_gif_error_unexpected_eof
: puffs_gif_status_short_read;
return status;
}
uint8_t t_0 = a_src->ptr[a_src->ri++];
uint8_t t_0 = a_src.buf->ptr[a_src.buf->ri++];
v_c[v_i] = t_0;
v_i += 1;
}
@@ -344,7 +350,7 @@ puffs_gif_status puffs_gif_decoder_decode_header(puffs_gif_decoder* self,
}
puffs_gif_status puffs_gif_decoder_decode_lsd(puffs_gif_decoder* self,
puffs_base_buf1* a_src) {
puffs_base_reader1 a_src) {
puffs_gif_status status = self->private_impl.status;
uint8_t v_c[7];
@@ -356,12 +362,12 @@ puffs_gif_status puffs_gif_decoder_decode_lsd(puffs_gif_decoder* self,
};
v_i = 0;
while (v_i < 7) {
if (a_src->ri >= a_src->wi) {
status = a_src->closed ? puffs_gif_error_unexpected_eof
: puffs_gif_status_short_read;
if (a_src.buf->ri >= a_src.buf->wi) {
status = a_src.buf->closed ? puffs_gif_error_unexpected_eof
: puffs_gif_status_short_read;
return status;
}
uint8_t t_0 = a_src->ptr[a_src->ri++];
uint8_t t_0 = a_src.buf->ptr[a_src.buf->ri++];
v_c[v_i] = t_0;
v_i += 1;
}
@@ -374,26 +380,26 @@ puffs_gif_status puffs_gif_decoder_decode_lsd(puffs_gif_decoder* self,
v_gct_size = (((uint32_t)(1)) << (1 + (v_c[4] & 7)));
v_i = 0;
while (v_i < v_gct_size) {
if (a_src->ri >= a_src->wi) {
status = a_src->closed ? puffs_gif_error_unexpected_eof
: puffs_gif_status_short_read;
if (a_src.buf->ri >= a_src.buf->wi) {
status = a_src.buf->closed ? puffs_gif_error_unexpected_eof
: puffs_gif_status_short_read;
return status;
}
uint8_t t_1 = a_src->ptr[a_src->ri++];
uint8_t t_1 = a_src.buf->ptr[a_src.buf->ri++];
self->private_impl.f_gct[(3 * v_i) + 0] = t_1;
if (a_src->ri >= a_src->wi) {
status = a_src->closed ? puffs_gif_error_unexpected_eof
: puffs_gif_status_short_read;
if (a_src.buf->ri >= a_src.buf->wi) {
status = a_src.buf->closed ? puffs_gif_error_unexpected_eof
: puffs_gif_status_short_read;
return status;
}
uint8_t t_2 = a_src->ptr[a_src->ri++];
uint8_t t_2 = a_src.buf->ptr[a_src.buf->ri++];
self->private_impl.f_gct[(3 * v_i) + 1] = t_2;
if (a_src->ri >= a_src->wi) {
status = a_src->closed ? puffs_gif_error_unexpected_eof
: puffs_gif_status_short_read;
if (a_src.buf->ri >= a_src.buf->wi) {
status = a_src.buf->closed ? puffs_gif_error_unexpected_eof
: puffs_gif_status_short_read;
return status;
}
uint8_t t_3 = a_src->ptr[a_src->ri++];
uint8_t t_3 = a_src.buf->ptr[a_src.buf->ri++];
self->private_impl.f_gct[(3 * v_i) + 2] = t_3;
v_i += 1;
}
@@ -423,8 +429,8 @@ void puffs_gif_lzw_decoder_set_literal_width(puffs_gif_lzw_decoder* self,
}
puffs_gif_status puffs_gif_lzw_decoder_decode(puffs_gif_lzw_decoder* self,
puffs_base_buf1* a_dst,
puffs_base_buf1* a_src) {
puffs_base_writer1 a_dst,
puffs_base_reader1 a_src) {
if (!self) {
return puffs_gif_error_bad_receiver;
}
@@ -436,10 +442,6 @@ puffs_gif_status puffs_gif_lzw_decoder_decode(puffs_gif_lzw_decoder* self,
status = puffs_gif_error_constructor_not_called;
goto cleanup0;
}
if (!a_dst || !a_src) {
status = puffs_gif_error_bad_argument;
goto cleanup0;
}
uint32_t v_clear_code;
uint32_t v_end_code;
@@ -464,12 +466,12 @@ puffs_gif_status puffs_gif_lzw_decoder_decode(puffs_gif_lzw_decoder* self,
label_0_continue:;
while (true) {
while (v_n_bits < v_width) {
if (a_src->ri >= a_src->wi) {
status = a_src->closed ? puffs_gif_error_unexpected_eof
: puffs_gif_status_short_read;
if (a_src.buf->ri >= a_src.buf->wi) {
status = a_src.buf->closed ? puffs_gif_error_unexpected_eof
: puffs_gif_status_short_read;
goto cleanup0;
}
uint8_t t_0 = a_src->ptr[a_src->ri++];
uint8_t t_0 = a_src.buf->ptr[a_src.buf->ri++];
v_bits |= (((uint32_t)(t_0)) << v_n_bits);
v_n_bits += 8;
}
@@ -477,11 +479,11 @@ label_0_continue:;
v_bits >>= v_width;
v_n_bits -= v_width;
if (v_code < v_clear_code) {
if (a_dst->wi >= a_dst->len) {
if (a_dst.buf->wi >= a_dst.buf->len) {
status = puffs_gif_status_short_write;
goto cleanup0;
}
a_dst->ptr[a_dst->wi++] = ((uint8_t)(v_code));
a_dst.buf->ptr[a_dst.buf->wi++] = ((uint8_t)(v_code));
if (v_use_save_code) {
self->private_impl.f_suffixes[v_save_code] = ((uint8_t)(v_code));
self->private_impl.f_prefixes[v_save_code] = ((uint16_t)(v_prev_code));
@@ -515,18 +517,18 @@ label_0_continue:;
if ((v_code == v_save_code) && v_use_save_code) {
self->private_impl.f_stack[4095] = ((uint8_t)(v_c));
}
if (a_dst->closed) {
if (a_dst.buf->closed) {
status = puffs_gif_error_closed_for_writes;
goto cleanup0;
}
if ((a_dst->len - a_dst->wi) <
if ((a_dst.buf->len - a_dst.buf->wi) <
(sizeof(self->private_impl.f_stack) - v_s)) {
status = puffs_gif_status_short_write;
goto cleanup0;
}
memmove(a_dst->ptr + a_dst->wi, self->private_impl.f_stack + v_s,
memmove(a_dst.buf->ptr + a_dst.buf->wi, self->private_impl.f_stack + v_s,
sizeof(self->private_impl.f_stack) - v_s);
a_dst->wi += sizeof(self->private_impl.f_stack) - v_s;
a_dst.buf->wi += sizeof(self->private_impl.f_stack) - v_s;
if (v_use_save_code) {
self->private_impl.f_suffixes[v_save_code] = ((uint8_t)(v_c));
self->private_impl.f_prefixes[v_save_code] = ((uint16_t)(v_prev_code));
+14 -4
View File
@@ -49,6 +49,16 @@ typedef struct {
bool closed; // No further writes are expected.
} puffs_base_buf1;
typedef struct {
puffs_base_buf1* buf;
// TODO: limits.
} puffs_base_reader1;
typedef struct {
puffs_base_buf1* buf;
// TODO: limits.
} puffs_base_writer1;
#endif // PUFFS_BASE_HEADER_H
#ifdef __cplusplus
@@ -145,15 +155,15 @@ void puffs_gif_decoder_destructor(puffs_gif_decoder* self);
// ---------------- Public Function Prototypes
puffs_gif_status puffs_gif_decoder_decode(puffs_gif_decoder* self,
puffs_base_buf1* a_dst,
puffs_base_buf1* a_src);
puffs_base_writer1 a_dst,
puffs_base_reader1 a_src);
void puffs_gif_lzw_decoder_set_literal_width(puffs_gif_lzw_decoder* self,
uint32_t a_lw);
puffs_gif_status puffs_gif_lzw_decoder_decode(puffs_gif_lzw_decoder* self,
puffs_base_buf1* a_dst,
puffs_base_buf1* a_src);
puffs_base_writer1 a_dst,
puffs_base_reader1 a_src);
#ifdef __cplusplus
} // extern "C"