From ffced7be7e48df002cef8d7f6999308ed94f50da Mon Sep 17 00:00:00 2001 From: kramm Date: Fri, 14 Feb 2003 19:29:40 +0000 Subject: [PATCH] bugfixes, cleanups. --- lib/bitio.c | 415 ++++++++++++++++++++++++++++++++--------------------------- lib/bitio.h | 1 + 2 files changed, 223 insertions(+), 193 deletions(-) diff --git a/lib/bitio.c b/lib/bitio.c index 133b45e..1e5594a 100644 --- a/lib/bitio.c +++ b/lib/bitio.c @@ -6,8 +6,8 @@ Copyright (c) 2001 Matthias Kramm This file is distributed under the GPL, see file COPYING for details */ -#include +#include #include #include #include @@ -21,50 +21,15 @@ #endif #include "./bitio.h" -struct memread_t -{ - unsigned char*data; - int length; -}; - -struct memwrite_t -{ - unsigned char*data; - int length; -}; - -struct zlibinflate_t -{ -#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 -}; +/* ---------------------------- file reader ------------------------------- */ -void reader_resetbits(struct reader_t*r) +static int reader_fileread(struct reader_t*reader, void* data, int len) { - r->mybyte = 0; - r->bitpos = 8; - + int ret = read((int)reader->internal, data, len); + if(ret>=0) + reader->pos += ret; + return ret; } - -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; @@ -75,6 +40,27 @@ void reader_init_filereader(struct reader_t*r, int handle) r->pos = 0; } +/* ---------------------------- mem reader ------------------------------- */ + +struct memread_t +{ + unsigned char*data; + int length; +}; +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; + } +} void reader_init_memreader(struct reader_t*r, void*newdata, int newlength) { struct memread_t*mr = malloc(sizeof(struct memread_t)); @@ -86,33 +72,105 @@ void reader_init_memreader(struct reader_t*r, void*newdata, int newlength) r->mybyte = 0; r->bitpos = 8; r->pos = 0; +} + +/* ---------------------------- mem writer ------------------------------- */ + +struct memwrite_t +{ + unsigned char*data; + int length; +}; + +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_memwrite_finish(struct writer_t*w) +{ + free(w->internal); +} +void writer_init_memwriter(struct writer_t*w, void*data, int len) +{ + 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 reader_init_zlibinflate(struct reader_t*r, struct reader_t*input) +/* ---------------------------- file writer ------------------------------- */ + +struct filewrite_t { -#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; - z->zs.zfree = Z_NULL; - z->zs.opaque = Z_NULL; - 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"); + int handle; + char free_handle; +}; + +static int writer_filewrite_write(struct writer_t*w, void* data, int len) +{ + struct filewrite_t * fw= (struct filewrite_t*)w->internal; + return write(fw->handle, data, len); +} +static void writer_filewrite_finish(struct writer_t*w) +{ + struct filewrite_t *mr = (struct filewrite_t*)w->internal; + if(mr->free_handle) + close(mr->handle); + free(mr); +} +void writer_init_filewriter(struct writer_t*w, int handle) +{ + struct filewrite_t *mr = malloc(sizeof(struct filewrite_t)); + mr->handle = handle; + mr->free_handle = 0; + memset(w, 0, sizeof(struct writer_t)); + w->write = writer_filewrite_write; + w->finish = writer_filewrite_finish; + w->internal = mr; + w->type = WRITER_TYPE_FILE; + w->bitpos = 0; + w->mybyte = 0; + w->pos = 0; +} +void writer_init_filewriter2(struct writer_t*w, char*filename) +{ + int fi = open("movie.swf", +#ifdef O_BINARY + O_BINARY| #endif + O_WRONLY|O_CREAT|O_TRUNC, 0644); + writer_init_filewriter(w, fi); + ((struct filewrite_t*)w->internal)->free_handle = 1; } +/* ---------------------------- zlibinflate writer -------------------------- */ + +struct zlibinflate_t +{ +#ifdef HAVE_ZLIB + z_stream zs; + struct reader_t*input; + unsigned char readbuffer[ZLIB_BUFFER_SIZE]; +#endif +}; + #ifdef HAVE_ZLIB static void zlib_error(int ret, char* msg, z_stream*zs) { @@ -125,35 +183,16 @@ static void zlib_error(int ret, char* msg, z_stream*zs) } #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) + if(!z) { + fprintf(stderr, "zlib not initialized!\n"); + return 0; + } + if(!len) return 0; z->zs.next_out = data; @@ -192,127 +231,52 @@ static int reader_zlibinflate(struct reader_t*reader, void* data, int len) exit(1); #endif } -unsigned int reader_readbit(struct reader_t*r) -{ - if(r->bitpos==8) - { - r->bitpos=0; - r->read(r, &r->mybyte, 1); - } - return (r->mybyte>>(7-r->bitpos++))&1; -} -unsigned int reader_readbits(struct reader_t*r, int num) -{ - int t; - int val = 0; - for(t=0;tinternal, data, len); -} -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_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; -} -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; -} -void writer_init_memwriter(struct writer_t*w, void*data, int len) -{ - 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) +void reader_init_zlibinflate(struct reader_t*r, struct reader_t*input) { #ifdef HAVE_ZLIB - struct zlibdeflate_t*z; + struct zlibinflate_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(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; z->zs.zfree = Z_NULL; z->zs.opaque = Z_NULL; - ret = deflateInit(&z->zs, 9); - if (ret != Z_OK) zlib_error(ret, "bitio:deflate_init", &z->zs); - w->bitpos = 0; - w->mybyte = 0; - z->zs.next_out = z->writebuffer; - z->zs.avail_out = ZLIB_BUFFER_SIZE; + 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"); - exit(1); #endif } + +/* ---------------------------- zlibdeflate writer -------------------------- */ + +struct zlibdeflate_t +{ +#ifdef HAVE_ZLIB + z_stream zs; + struct writer_t*output; + unsigned char writebuffer[ZLIB_BUFFER_SIZE]; +#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) + if(!z) { + fprintf(stderr, "zlib not initialized!\n"); + return 0; + } + if(!len) return 0; z->zs.next_in = data; @@ -352,7 +316,7 @@ static void writer_zlibdeflate_finish(struct writer_t*writer) while(1) { ret = deflate(&z->zs, Z_FINISH); if (ret != Z_OK && - ret != Z_STREAM_END) zlib_error(ret, "bitio:deflate_deflate", &z->zs); + ret != Z_STREAM_END) zlib_error(ret, "bitio:deflate_finish", &z->zs); if(z->zs.next_out != z->writebuffer) { z->output->write(z->output, z->writebuffer, z->zs.next_out - (Bytef*)z->writebuffer); @@ -375,6 +339,37 @@ static void writer_zlibdeflate_finish(struct writer_t*writer) exit(1); #endif } +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; + z->zs.zfree = Z_NULL; + z->zs.opaque = Z_NULL; + ret = deflateInit(&z->zs, 9); + if (ret != Z_OK) zlib_error(ret, "bitio:deflate_init", &z->zs); + w->bitpos = 0; + 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 +} + +/* ----------------------- bit handling routines -------------------------- */ void writer_writebit(struct writer_t*w, int bit) { @@ -396,4 +391,38 @@ void writer_writebits(struct writer_t*w, unsigned int data, int bits) writer_writebit(w, (data >> (bits-t-1))&1); } } +void writer_resetbits(struct writer_t*w) +{ + if(w->bitpos) + w->write(w, &w->mybyte, 1); + w->bitpos = 0; + w->mybyte = 0; +} + +unsigned int reader_readbit(struct reader_t*r) +{ + if(r->bitpos==8) + { + r->bitpos=0; + r->read(r, &r->mybyte, 1); + } + return (r->mybyte>>(7-r->bitpos++))&1; +} +unsigned int reader_readbits(struct reader_t*r, int num) +{ + int t; + int val = 0; + for(t=0;tmybyte = 0; + r->bitpos = 8; + +} diff --git a/lib/bitio.h b/lib/bitio.h index 8e08a65..3781a03 100644 --- a/lib/bitio.h +++ b/lib/bitio.h @@ -56,6 +56,7 @@ void reader_init_zlibinflate(struct reader_t*r, struct reader_t*input); void reader_init_memreader(struct reader_t*r, void*data, int length); void writer_init_filewriter(struct writer_t*w, int handle); +void writer_init_filewriter2(struct writer_t*w, char*filename); void writer_init_zlibdeflate(struct writer_t*w, struct writer_t*output); void writer_init_memwriter(struct writer_t*r, void*data, int length); -- 1.7.10.4