X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fbitio.c;h=133b45e3cc099d224cdaffd34617de398ae62d0e;hb=34de503961eb25613a5b3f2a8e5bdb5d1f5de0e9;hp=6aed54c610c5d747888b2479b0d95666bf738996;hpb=fe3b292bffaee6dfa415ae04978b8a2b8025701f;p=swftools.git diff --git a/lib/bitio.c b/lib/bitio.c index 6aed54c..133b45e 100644 --- a/lib/bitio.c +++ b/lib/bitio.c @@ -1,69 +1,105 @@ -#define READER_TYPE_FILE 0 -#define READER_TYPE_MEM 1 -#define READER_TYPE_ZLIB 2 -#define WRITER_TYPE_FILE 0 -#define WRITER_TYPE_MEM 1 -#define WRITER_TYPE_ZLIB 2 - -struct reader_t +/* bitio.c + implementation of bitio.h. + + Part of the swftools package. + + Copyright (c) 2001 Matthias Kramm + + This file is distributed under the GPL, see file COPYING for details */ +#include + +#include +#include +#include +#include + +#include "../config.h" + +#ifdef HAVE_ZLIB +#include +#define ZLIB_BUFFER_SIZE 16384 +#endif +#include "./bitio.h" + +struct memread_t { - int (*read)(struct reader_t*, void*data, int len); - void *internal; - int type; - unsigned char mybyte; - unsigned char bitpos; + unsigned char*data; + int length; }; -struct writer_t + +struct memwrite_t { - int (*write)(struct writer_t*, void*data, int len); - void (*finish)(); - void *internal; - int type; - unsigned char mybyte; - unsigned char bitpos; + unsigned char*data; + int length; }; -static int reader_fileread(struct reader_t*reader, void* data, int len) + +struct zlibinflate_t { - return read((int)reader->internal, data, len); -} -static void reader_resetbits(struct reader_t*r) +#ifdef HAVE_ZLIB + z_stream zs; + struct reader_t*input; + unsigned char readbuffer[ZLIB_BUFFER_SIZE]; +#endif +}; + +struct zlibdeflate_t +{ +#ifdef HAVE_ZLIB + z_stream zs; + struct writer_t*output; + unsigned char writebuffer[ZLIB_BUFFER_SIZE]; +#endif +}; + +void reader_resetbits(struct reader_t*r) { r->mybyte = 0; r->bitpos = 8; + } -static void reader_init_filereader(struct reader_t*r, int handle) + +static int reader_zlibinflate(struct reader_t*reader, void* data, int len); +static int reader_fileread(struct reader_t*reader, void* data, int len); +static int reader_memread(struct reader_t*reader, void* data, int len); +#ifdef HAVE_ZLIB +static void zlib_error(int ret, char* msg, z_stream*zs); +#endif + +void reader_init_filereader(struct reader_t*r, int handle) { r->read = reader_fileread; r->internal = (void*)handle; r->type = READER_TYPE_FILE; r->mybyte = 0; r->bitpos = 8; + r->pos = 0; } -#define ZLIB_BUFFER_SIZE 16384 -struct zlibinflate_t -{ - z_stream zs; - struct reader_t*input; - U8 readbuffer[ZLIB_BUFFER_SIZE]; -}; -static void zlib_error(int ret, char* msg, z_stream*zs) + +void reader_init_memreader(struct reader_t*r, void*newdata, int newlength) { - fprintf(stderr, "%s: zlib error (%d): last zlib error: %s\n", - msg, - ret, - zs->msg?zs->msg:"unknown"); - perror("errno:"); - exit(1); + struct memread_t*mr = malloc(sizeof(struct memread_t)); + mr->data = newdata; + mr->length = newlength; + r->read = reader_memread; + r->internal = (void*)mr; + r->type = READER_TYPE_MEM; + r->mybyte = 0; + r->bitpos = 8; + r->pos = 0; } -static int reader_zlibinflate(struct reader_t*reader, void* data, int len); -static void reader_init_zlibinflate(struct reader_t*r, struct reader_t*input) + +void reader_init_zlibinflate(struct reader_t*r, struct reader_t*input) { +#ifdef HAVE_ZLIB struct zlibinflate_t*z; int ret; + memset(r, 0, sizeof(struct reader_t)); z = (struct zlibinflate_t*)malloc(sizeof(struct zlibinflate_t)); + memset(z, 0, sizeof(struct zlibinflate_t)); r->internal = z; r->read = reader_zlibinflate; r->type = READER_TYPE_ZLIB; + r->pos = 0; z->input = input; memset(&z->zs,0,sizeof(z_stream)); z->zs.zalloc = Z_NULL; @@ -72,9 +108,49 @@ static void reader_init_zlibinflate(struct reader_t*r, struct reader_t*input) ret = inflateInit(&z->zs); if (ret != Z_OK) zlib_error(ret, "bitio:inflate_init", &z->zs); reader_resetbits(r); +#else + fprintf(stderr, "Error: swftools was compiled without zlib support"); +#endif } + +#ifdef HAVE_ZLIB +static void zlib_error(int ret, char* msg, z_stream*zs) +{ + fprintf(stderr, "%s: zlib error (%d): last zlib error: %s\n", + msg, + ret, + zs->msg?zs->msg:"unknown"); + perror("errno:"); + exit(1); +} +#endif + +static int reader_fileread(struct reader_t*reader, void* data, int len) +{ + int ret = read((int)reader->internal, data, len); + if(ret>=0) + reader->pos += ret; + return ret; +} + +static int reader_memread(struct reader_t*reader, void* data, int len) +{ + struct memread_t*mr = (struct memread_t*)reader->internal; + + if(mr->length - reader->pos > len) { + memcpy(data, &mr->data[reader->pos], len); + reader->pos += len; + return len; + } else { + memcpy(data, &mr->data[reader->pos], mr->length - reader->pos); + reader->pos = mr->length; + return mr->length - reader->pos; + } +} + static int reader_zlibinflate(struct reader_t*reader, void* data, int len) { +#ifdef HAVE_ZLIB struct zlibinflate_t*z = (struct zlibinflate_t*)reader->internal; int ret; if(!z) @@ -102,15 +178,21 @@ static int reader_zlibinflate(struct reader_t*reader, void* data, int len) if (ret != Z_OK) zlib_error(ret, "bitio:inflate_end", &z->zs); free(reader->internal); reader->internal = 0; + reader->pos += pos; return pos; } if(!z->zs.avail_out) { break; } } + reader->pos += len; return len; +#else + fprintf(stderr, "Error: swftools was compiled without zlib support"); + exit(1); +#endif } -static unsigned int reader_readbit(struct reader_t*r) +unsigned int reader_readbit(struct reader_t*r) { if(r->bitpos==8) { @@ -119,7 +201,7 @@ static unsigned int reader_readbit(struct reader_t*r) } return (r->mybyte>>(7-r->bitpos++))&1; } -static unsigned int reader_readbits(struct reader_t*r, int num) +unsigned int reader_readbits(struct reader_t*r, int num) { int t; int val = 0; @@ -130,46 +212,85 @@ static unsigned int reader_readbits(struct reader_t*r, int num) } return val; } + +static int writer_zlibdeflate_write(struct writer_t*writer, void* data, int len); +static void writer_zlibdeflate_finish(struct writer_t*writer); +static int writer_filewrite_write(struct writer_t*w, void* data, int len); +static void writer_filewrite_finish(struct writer_t*w); + static int writer_filewrite_write(struct writer_t*w, void* data, int len) { return write((int)w->internal, data, len); } -static void writer_filewrite_finish() +static void writer_filewrite_finish(struct writer_t*w) +{ +} + +static int writer_memwrite_write(struct writer_t*w, void* data, int len) { + struct memread_t*mw = (struct memread_t*)w->internal; + if(mw->length - w->pos > len) { + memcpy(&mw->data[w->pos], data, len); + w->pos += len; + return len; + } else { + memcpy(&mw->data[w->pos], data, mw->length - w->pos); + w->pos = mw->length; + return mw->length - w->pos; + } } -static void writer_resetbits(struct writer_t*w) +static void writer_memwrite_finish(struct writer_t*w) +{ + free(w->internal); +} + +void writer_resetbits(struct writer_t*w) { if(w->bitpos) w->write(w, &w->mybyte, 1); w->bitpos = 0; w->mybyte = 0; } -static void writer_init_filewriter(struct writer_t*w, int handle) +void writer_init_filewriter(struct writer_t*w, int handle) { + memset(w, 0, sizeof(struct writer_t)); w->write = writer_filewrite_write; w->finish = writer_filewrite_finish; w->internal = (void*)handle; w->type = WRITER_TYPE_FILE; w->bitpos = 0; w->mybyte = 0; + w->pos = 0; } -struct zlibdeflate_t +void writer_init_memwriter(struct writer_t*w, void*data, int len) { - z_stream zs; - struct writer_t*output; - U8 writebuffer[ZLIB_BUFFER_SIZE]; -}; -static int writer_zlibdeflate_write(struct writer_t*writer, void* data, int len); -static void writer_zlibdeflate_finish(); -static void writer_init_zlibdeflate(struct writer_t*w, struct writer_t*output) + struct memwrite_t *mr; + mr = malloc(sizeof(struct memwrite_t)); + mr->data = data; + mr->length = len; + memset(w, 0, sizeof(struct writer_t)); + w->write = writer_memwrite_write; + w->finish = writer_memwrite_finish; + w->internal = (void*)mr; + w->type = WRITER_TYPE_FILE; + w->bitpos = 0; + w->mybyte = 0; + w->pos = 0; +} + +void writer_init_zlibdeflate(struct writer_t*w, struct writer_t*output) { +#ifdef HAVE_ZLIB struct zlibdeflate_t*z; int ret; + memset(w, 0, sizeof(struct writer_t)); z = (struct zlibdeflate_t*)malloc(sizeof(struct zlibdeflate_t)); + memset(z, 0, sizeof(struct zlibdeflate_t)); w->internal = z; w->write = writer_zlibdeflate_write; w->finish = writer_zlibdeflate_finish; w->type = WRITER_TYPE_ZLIB; + w->pos = 0; z->output = output; memset(&z->zs,0,sizeof(z_stream)); z->zs.zalloc = Z_NULL; @@ -181,9 +302,14 @@ static void writer_init_zlibdeflate(struct writer_t*w, struct writer_t*output) w->mybyte = 0; z->zs.next_out = z->writebuffer; z->zs.avail_out = ZLIB_BUFFER_SIZE; +#else + fprintf(stderr, "Error: swftools was compiled without zlib support"); + exit(1); +#endif } static int writer_zlibdeflate_write(struct writer_t*writer, void* data, int len) { +#ifdef HAVE_ZLIB struct zlibdeflate_t*z = (struct zlibdeflate_t*)writer->internal; int ret; if(!z) @@ -207,14 +333,22 @@ static int writer_zlibdeflate_write(struct writer_t*writer, void* data, int len) break; } } + writer->pos += len; return len; +#else + fprintf(stderr, "Error: swftools was compiled without zlib support"); + exit(1); +#endif } static void writer_zlibdeflate_finish(struct writer_t*writer) { +#ifdef HAVE_ZLIB struct zlibdeflate_t*z = (struct zlibdeflate_t*)writer->internal; + struct writer_t*output; int ret; if(!z) return; + output= z->output; while(1) { ret = deflate(&z->zs, Z_FINISH); if (ret != Z_OK && @@ -235,9 +369,14 @@ static void writer_zlibdeflate_finish(struct writer_t*writer) if (ret != Z_OK) zlib_error(ret, "bitio:deflate_end", &z->zs); free(writer->internal); writer->internal = 0; + output->finish(output); +#else + fprintf(stderr, "Error: swftools was compiled without zlib support"); + exit(1); +#endif } -static void writer_writebit(struct writer_t*w, int bit) +void writer_writebit(struct writer_t*w, int bit) { if(w->bitpos==8) { @@ -249,7 +388,7 @@ static void writer_writebit(struct writer_t*w, int bit) w->mybyte |= 1 << (7 - w->bitpos); w->bitpos ++; } -static void writer_writebits(struct writer_t*w, U32 data, int bits) +void writer_writebits(struct writer_t*w, unsigned int data, int bits) { int t; for(t=0;t