X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fbitio.c;h=06fdfcc3bcd7c77ed8969d9be0e5d97647fc1606;hb=03eb983d1660536436c2a1686f59f3793bcb8784;hp=00ac6475d279c2082e9a36c81ff64fe5fc626173;hpb=1d053636d67cc0457784a20f1f7a3befce493e24;p=swftools.git diff --git a/lib/bitio.c b/lib/bitio.c index 00ac647..06fdfcc 100644 --- a/lib/bitio.c +++ b/lib/bitio.c @@ -1,49 +1,177 @@ -#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 -{ - int (*read)(struct reader_t*, void*data, int len); - void *internal; - int type; - unsigned char mybyte; - unsigned char bitpos; -}; -struct writer_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" + +/* ---------------------------- file reader ------------------------------- */ + +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; +} +void reader_init_filereader(struct reader_t*r, int handle) { - int (*write)(struct writer_t*, void*data, int len); - void *internal; - int type; - unsigned char mybyte; - unsigned char bitpos; + r->read = reader_fileread; + r->internal = (void*)handle; + r->type = READER_TYPE_FILE; + r->mybyte = 0; + r->bitpos = 8; + r->pos = 0; +} + +/* ---------------------------- mem reader ------------------------------- */ + +struct memread_t +{ + unsigned char*data; + int length; }; -static int reader_fileread(struct reader_t*reader, void* data, int len) +static int reader_memread(struct reader_t*reader, void* data, int len) { - return read((int)reader->internal, data, 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 void reader_resetbits(struct reader_t*r) +void reader_init_memreader(struct reader_t*r, void*newdata, int newlength) { + 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; +} + +/* ---------------------------- 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 reader_init_filereader(struct reader_t*r, int handle) +static void writer_memwrite_finish(struct writer_t*w) { - r->read = reader_fileread; - r->internal = (void*)handle; - r->type = READER_TYPE_FILE; - reader_resetbits(r); + free(w->internal); } -#define ZLIB_BUFFER_SIZE 16384 +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; +} + +/* ---------------------------- file writer ------------------------------- */ + +struct filewrite_t +{ + 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; - U8 readbuffer[ZLIB_BUFFER_SIZE]; + unsigned char readbuffer[ZLIB_BUFFER_SIZE]; +#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", @@ -53,29 +181,17 @@ static void zlib_error(int ret, char* msg, z_stream*zs) perror("errno:"); exit(1); } -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) -{ - struct zlibinflate_t*z; - int ret; - z = (struct zlibinflate_t*)malloc(sizeof(struct zlibinflate_t)); - r->internal = z; - r->read = reader_zlibinflate; - r->type = READER_TYPE_ZLIB; - 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); -} +#endif + 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) { + return 0; + } + if(!len) return 0; z->zs.next_out = data; @@ -100,54 +216,161 @@ 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) +void reader_init_zlibinflate(struct reader_t*r, struct reader_t*input) { - if(r->bitpos==8) - { - r->bitpos=0; - r->read(r, &r->mybyte, 1); - } - return (r->mybyte>>(7-r->bitpos++))&1; +#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"); +#endif } -static unsigned int reader_readbits(struct reader_t*r, int num) + +/* ---------------------------- zlibdeflate writer -------------------------- */ + +struct zlibdeflate_t { - int t; - int val = 0; - for(t=0;tinternal, data, len); +#ifdef HAVE_ZLIB + struct zlibdeflate_t*z = (struct zlibdeflate_t*)writer->internal; + int ret; + if(!z) { + fprintf(stderr, "zlib not initialized!\n"); + return 0; + } + if(!len) + return 0; + + z->zs.next_in = data; + z->zs.avail_in = len; + + while(1) { + ret = deflate(&z->zs, Z_NO_FLUSH); + + if (ret != Z_OK) zlib_error(ret, "bitio:deflate_deflate", &z->zs); + + if(z->zs.next_out != z->writebuffer) { + z->output->write(z->output, z->writebuffer, z->zs.next_out - (Bytef*)z->writebuffer); + z->zs.next_out = z->writebuffer; + z->zs.avail_out = ZLIB_BUFFER_SIZE; + } + + if(!z->zs.avail_in) { + break; + } + } + writer->pos += len; + return len; +#else + fprintf(stderr, "Error: swftools was compiled without zlib support"); + exit(1); +#endif } -static void writer_resetbits(struct writer_t*w) +static void writer_zlibdeflate_finish(struct writer_t*writer) { - if(w->bitpos) - w->write(w, &w->mybyte, 1); - w->bitpos = 0; - w->mybyte = 0; +#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 && + 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); + z->zs.next_out = z->writebuffer; + z->zs.avail_out = ZLIB_BUFFER_SIZE; + } + + if (ret == Z_STREAM_END) { + break; + + } + } + ret = deflateEnd(&z->zs); + 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_init_filewriter(struct writer_t*w, int handle) +void writer_init_zlibdeflate(struct writer_t*w, struct writer_t*output) { - w->write = writer_filewrite; - w->internal = (void*)handle; - w->type = WRITER_TYPE_FILE; +#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 } -static void writer_writebit(struct writer_t*w, int bit) + +/* ----------------------- bit handling routines -------------------------- */ + +void writer_writebit(struct writer_t*w, int bit) { if(w->bitpos==8) { @@ -159,7 +382,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> (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; + +}