mirror of
https://github.com/ddidderr/wuffs.git
synced 2026-11-18 00:32:11 +01:00
Rename FOO_BUFFER_SIZE to FOO_BUFFER_ARRAY_SIZE
This commit is contained in:
1 parent
01abc84784
commit
fdac24a425
12 files changed
+136
-126
No files matched your search
@@ -50,11 +50,11 @@ for a C++ compiler $CXX, such as clang++ or g++.
|
||||
// program to generate a stand-alone C++ file.
|
||||
#include "../../release/c/wuffs-unsupported-snapshot.c"
|
||||
|
||||
#ifndef SRC_BUFFER_SIZE
|
||||
#define SRC_BUFFER_SIZE (32 * 1024)
|
||||
#ifndef SRC_BUFFER_ARRAY_SIZE
|
||||
#define SRC_BUFFER_ARRAY_SIZE (32 * 1024)
|
||||
#endif
|
||||
|
||||
uint8_t src_buffer[SRC_BUFFER_SIZE];
|
||||
uint8_t src_buffer_array[SRC_BUFFER_ARRAY_SIZE];
|
||||
|
||||
int //
|
||||
main(int argc, char** argv) {
|
||||
@@ -66,8 +66,10 @@ main(int argc, char** argv) {
|
||||
}
|
||||
|
||||
while (true) {
|
||||
size_t n = fread(src_buffer, sizeof(uint8_t), SRC_BUFFER_SIZE, stdin);
|
||||
uint32_t checksum = h.update_u32(wuffs_base__make_slice_u8(src_buffer, n));
|
||||
size_t n =
|
||||
fread(src_buffer_array, sizeof(uint8_t), SRC_BUFFER_ARRAY_SIZE, stdin);
|
||||
uint32_t checksum =
|
||||
h.update_u32(wuffs_base__make_slice_u8(src_buffer_array, n));
|
||||
if (feof(stdin)) {
|
||||
printf("%08" PRIx32 "\n", checksum);
|
||||
return 0;
|
||||
|
||||
@@ -102,14 +102,14 @@ micros_since_start(struct timespec* now) {
|
||||
//
|
||||
// We keep the whole input in memory, instead of one-pass stream processing,
|
||||
// because playing a looping animation requires re-winding the input.
|
||||
#ifndef SRC_BUFFER_SIZE
|
||||
#define SRC_BUFFER_SIZE (64 * 1024 * 1024)
|
||||
#ifndef SRC_BUFFER_ARRAY_SIZE
|
||||
#define SRC_BUFFER_ARRAY_SIZE (64 * 1024 * 1024)
|
||||
#endif
|
||||
#ifndef MAX_DIMENSION
|
||||
#define MAX_DIMENSION (4096)
|
||||
#endif
|
||||
|
||||
uint8_t src_buffer[SRC_BUFFER_SIZE] = {0};
|
||||
uint8_t src_buffer_array[SRC_BUFFER_ARRAY_SIZE] = {0};
|
||||
size_t src_len = 0;
|
||||
|
||||
uint8_t* curr_dst_buffer = NULL;
|
||||
@@ -128,9 +128,9 @@ wuffs_base__flicks cumulative_delay_micros = 0;
|
||||
|
||||
const char* //
|
||||
read_stdin() {
|
||||
while (src_len < SRC_BUFFER_SIZE) {
|
||||
size_t n = fread(src_buffer + src_len, sizeof(uint8_t),
|
||||
SRC_BUFFER_SIZE - src_len, stdin);
|
||||
while (src_len < SRC_BUFFER_ARRAY_SIZE) {
|
||||
size_t n = fread(src_buffer_array + src_len, sizeof(uint8_t),
|
||||
SRC_BUFFER_ARRAY_SIZE - src_len, stdin);
|
||||
src_len += n;
|
||||
if (feof(stdin)) {
|
||||
return NULL;
|
||||
@@ -352,7 +352,7 @@ play() {
|
||||
}
|
||||
|
||||
wuffs_base__io_buffer src;
|
||||
src.data.ptr = src_buffer;
|
||||
src.data.ptr = src_buffer_array;
|
||||
src.data.len = src_len;
|
||||
src.meta.wi = src_len;
|
||||
src.meta.ri = 0;
|
||||
|
||||
@@ -67,7 +67,7 @@ The Escape key quits.
|
||||
#define MAX_DIMENSION 65535
|
||||
|
||||
#define NUM_BACKGROUND_COLORS 3
|
||||
#define SRC_BUFFER_SIZE (64 * 1024)
|
||||
#define SRC_BUFFER_ARRAY_SIZE (64 * 1024)
|
||||
|
||||
// Global variable names start with a "g_" prefix.
|
||||
|
||||
@@ -84,7 +84,7 @@ uint32_t g_height = 0;
|
||||
wuffs_base__slice_u8 g_workbuf_slice = {0};
|
||||
wuffs_base__slice_u8 g_pixbuf_slice = {0};
|
||||
wuffs_base__pixel_buffer g_pixbuf = {0};
|
||||
uint8_t g_src_buffer[SRC_BUFFER_SIZE] = {0};
|
||||
uint8_t g_src_buffer_array[SRC_BUFFER_ARRAY_SIZE] = {0};
|
||||
wuffs_base__io_buffer g_src = {0};
|
||||
wuffs_base__image_config g_image_config = {0};
|
||||
wuffs_base__image_decoder* g_image_decoder = NULL;
|
||||
@@ -123,7 +123,7 @@ load_image_type() {
|
||||
}
|
||||
|
||||
wuffs_base__status status;
|
||||
switch (g_src_buffer[0]) {
|
||||
switch (g_src_buffer_array[0]) {
|
||||
case '\x00':
|
||||
status = wuffs_wbmp__decoder__initialize(
|
||||
&g_potential_decoders.wbmp, sizeof g_potential_decoders.wbmp,
|
||||
@@ -297,8 +297,8 @@ load_image(const char* filename) {
|
||||
}
|
||||
g_width = 0;
|
||||
g_height = 0;
|
||||
g_src.data.ptr = g_src_buffer;
|
||||
g_src.data.len = SRC_BUFFER_SIZE;
|
||||
g_src.data.ptr = g_src_buffer_array;
|
||||
g_src.data.len = SRC_BUFFER_ARRAY_SIZE;
|
||||
g_src.meta.wi = 0;
|
||||
g_src.meta.ri = 0;
|
||||
g_src.meta.pos = 0;
|
||||
|
||||
+12
-12
@@ -168,19 +168,19 @@ int input_file_descriptor = 0; // A 0 default means stdin.
|
||||
#define INDENT_SPACES_STRING " "
|
||||
#define INDENT_TAB_STRING "\t"
|
||||
|
||||
#ifndef DST_BUFFER_SIZE
|
||||
#define DST_BUFFER_SIZE (32 * 1024)
|
||||
#ifndef DST_BUFFER_ARRAY_SIZE
|
||||
#define DST_BUFFER_ARRAY_SIZE (32 * 1024)
|
||||
#endif
|
||||
#ifndef SRC_BUFFER_SIZE
|
||||
#define SRC_BUFFER_SIZE (32 * 1024)
|
||||
#ifndef SRC_BUFFER_ARRAY_SIZE
|
||||
#define SRC_BUFFER_ARRAY_SIZE (32 * 1024)
|
||||
#endif
|
||||
#ifndef TOKEN_BUFFER_SIZE
|
||||
#define TOKEN_BUFFER_SIZE (4 * 1024)
|
||||
#ifndef TOKEN_BUFFER_ARRAY_SIZE
|
||||
#define TOKEN_BUFFER_ARRAY_SIZE (4 * 1024)
|
||||
#endif
|
||||
|
||||
uint8_t dst_array[DST_BUFFER_SIZE];
|
||||
uint8_t src_array[SRC_BUFFER_SIZE];
|
||||
wuffs_base__token tok_array[TOKEN_BUFFER_SIZE];
|
||||
uint8_t dst_array[DST_BUFFER_ARRAY_SIZE];
|
||||
uint8_t src_array[SRC_BUFFER_ARRAY_SIZE];
|
||||
wuffs_base__token tok_array[TOKEN_BUFFER_ARRAY_SIZE];
|
||||
|
||||
wuffs_base__io_buffer dst;
|
||||
wuffs_base__io_buffer src;
|
||||
@@ -513,15 +513,15 @@ parse_flags(int argc, char** argv) {
|
||||
const char* //
|
||||
initialize_globals(int argc, char** argv) {
|
||||
dst = wuffs_base__make_io_buffer(
|
||||
wuffs_base__make_slice_u8(dst_array, DST_BUFFER_SIZE),
|
||||
wuffs_base__make_slice_u8(dst_array, DST_BUFFER_ARRAY_SIZE),
|
||||
wuffs_base__empty_io_buffer_meta());
|
||||
|
||||
src = wuffs_base__make_io_buffer(
|
||||
wuffs_base__make_slice_u8(src_array, SRC_BUFFER_SIZE),
|
||||
wuffs_base__make_slice_u8(src_array, SRC_BUFFER_ARRAY_SIZE),
|
||||
wuffs_base__empty_io_buffer_meta());
|
||||
|
||||
tok = wuffs_base__make_token_buffer(
|
||||
wuffs_base__make_slice_token(tok_array, TOKEN_BUFFER_SIZE),
|
||||
wuffs_base__make_slice_token(tok_array, TOKEN_BUFFER_ARRAY_SIZE),
|
||||
wuffs_base__empty_token_buffer_meta());
|
||||
|
||||
curr_token_end_src_index = 0;
|
||||
|
||||
+11
-10
@@ -45,10 +45,10 @@ for a C compiler $CC, such as clang or gcc.
|
||||
#endif
|
||||
#include "wuffs/release/c/wuffs-unsupported-snapshot.c"
|
||||
|
||||
#ifndef DST_BUFFER_SIZE
|
||||
#define DST_BUFFER_SIZE 1024
|
||||
#ifndef DST_BUFFER_ARRAY_SIZE
|
||||
#define DST_BUFFER_ARRAY_SIZE 1024
|
||||
#endif
|
||||
uint8_t dst_buffer[DST_BUFFER_SIZE];
|
||||
uint8_t dst_buffer_array[DST_BUFFER_ARRAY_SIZE];
|
||||
|
||||
// src_ptr and src_len hold a gzip-encoded "Hello Wuffs."
|
||||
//
|
||||
@@ -68,19 +68,20 @@ uint8_t src_ptr[] = {
|
||||
};
|
||||
size_t src_len = 0x21;
|
||||
|
||||
#define WORK_BUFFER_SIZE WUFFS_GZIP__DECODER_WORKBUF_LEN_MAX_INCL_WORST_CASE
|
||||
#if WORK_BUFFER_SIZE > 0
|
||||
uint8_t work_buffer[WORK_BUFFER_SIZE];
|
||||
#define WORK_BUFFER_ARRAY_SIZE \
|
||||
WUFFS_GZIP__DECODER_WORKBUF_LEN_MAX_INCL_WORST_CASE
|
||||
#if WORK_BUFFER_ARRAY_SIZE > 0
|
||||
uint8_t work_buffer_array[WORK_BUFFER_ARRAY_SIZE];
|
||||
#else
|
||||
// Not all C/C++ compilers support 0-length arrays.
|
||||
uint8_t work_buffer[1];
|
||||
uint8_t work_buffer_array[1];
|
||||
#endif
|
||||
|
||||
static const char* //
|
||||
decode() {
|
||||
wuffs_base__io_buffer dst;
|
||||
dst.data.ptr = dst_buffer;
|
||||
dst.data.len = DST_BUFFER_SIZE;
|
||||
dst.data.ptr = dst_buffer_array;
|
||||
dst.data.len = DST_BUFFER_ARRAY_SIZE;
|
||||
dst.meta.wi = 0;
|
||||
dst.meta.ri = 0;
|
||||
dst.meta.pos = 0;
|
||||
@@ -108,7 +109,7 @@ decode() {
|
||||
}
|
||||
status = wuffs_gzip__decoder__transform_io(
|
||||
dec, &dst, &src,
|
||||
wuffs_base__make_slice_u8(work_buffer, WORK_BUFFER_SIZE));
|
||||
wuffs_base__make_slice_u8(work_buffer_array, WORK_BUFFER_ARRAY_SIZE));
|
||||
if (!wuffs_base__status__is_ok(&status)) {
|
||||
free(dec);
|
||||
return wuffs_base__status__message(&status);
|
||||
|
||||
+17
-16
@@ -61,23 +61,24 @@ for a C compiler $CC, such as clang or gcc.
|
||||
#define WUFFS_EXAMPLE_USE_SECCOMP
|
||||
#endif
|
||||
|
||||
#ifndef DST_BUFFER_SIZE
|
||||
#define DST_BUFFER_SIZE (128 * 1024)
|
||||
#ifndef DST_BUFFER_ARRAY_SIZE
|
||||
#define DST_BUFFER_ARRAY_SIZE (128 * 1024)
|
||||
#endif
|
||||
|
||||
#ifndef SRC_BUFFER_SIZE
|
||||
#define SRC_BUFFER_SIZE (128 * 1024)
|
||||
#ifndef SRC_BUFFER_ARRAY_SIZE
|
||||
#define SRC_BUFFER_ARRAY_SIZE (128 * 1024)
|
||||
#endif
|
||||
|
||||
#define WORK_BUFFER_SIZE WUFFS_GZIP__DECODER_WORKBUF_LEN_MAX_INCL_WORST_CASE
|
||||
#define WORK_BUFFER_ARRAY_SIZE \
|
||||
WUFFS_GZIP__DECODER_WORKBUF_LEN_MAX_INCL_WORST_CASE
|
||||
|
||||
uint8_t dst_buffer[DST_BUFFER_SIZE];
|
||||
uint8_t src_buffer[SRC_BUFFER_SIZE];
|
||||
#if WORK_BUFFER_SIZE > 0
|
||||
uint8_t work_buffer[WORK_BUFFER_SIZE];
|
||||
uint8_t dst_buffer_array[DST_BUFFER_ARRAY_SIZE];
|
||||
uint8_t src_buffer_array[SRC_BUFFER_ARRAY_SIZE];
|
||||
#if WORK_BUFFER_ARRAY_SIZE > 0
|
||||
uint8_t work_buffer_array[WORK_BUFFER_ARRAY_SIZE];
|
||||
#else
|
||||
// Not all C/C++ compilers support 0-length arrays.
|
||||
uint8_t work_buffer[1];
|
||||
uint8_t work_buffer_array[1];
|
||||
#endif
|
||||
|
||||
// ----
|
||||
@@ -150,16 +151,16 @@ main1(int argc, char** argv) {
|
||||
}
|
||||
|
||||
wuffs_base__io_buffer dst;
|
||||
dst.data.ptr = dst_buffer;
|
||||
dst.data.len = DST_BUFFER_SIZE;
|
||||
dst.data.ptr = dst_buffer_array;
|
||||
dst.data.len = DST_BUFFER_ARRAY_SIZE;
|
||||
dst.meta.wi = 0;
|
||||
dst.meta.ri = 0;
|
||||
dst.meta.pos = 0;
|
||||
dst.meta.closed = false;
|
||||
|
||||
wuffs_base__io_buffer src;
|
||||
src.data.ptr = src_buffer;
|
||||
src.data.len = SRC_BUFFER_SIZE;
|
||||
src.data.ptr = src_buffer_array;
|
||||
src.data.len = SRC_BUFFER_ARRAY_SIZE;
|
||||
src.meta.wi = 0;
|
||||
src.meta.ri = 0;
|
||||
src.meta.pos = 0;
|
||||
@@ -183,12 +184,12 @@ main1(int argc, char** argv) {
|
||||
while (true) {
|
||||
status = wuffs_gzip__decoder__transform_io(
|
||||
&dec, &dst, &src,
|
||||
wuffs_base__make_slice_u8(work_buffer, WORK_BUFFER_SIZE));
|
||||
wuffs_base__make_slice_u8(work_buffer_array, WORK_BUFFER_ARRAY_SIZE));
|
||||
|
||||
if (dst.meta.wi) {
|
||||
// TODO: handle EINTR and other write errors; see "man 2 write".
|
||||
const int stdout_fd = 1;
|
||||
ignore_return_value(write(stdout_fd, dst_buffer, dst.meta.wi));
|
||||
ignore_return_value(write(stdout_fd, dst_buffer_array, dst.meta.wi));
|
||||
dst.meta.ri = dst.meta.wi;
|
||||
wuffs_base__io_buffer__compact(&dst);
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user