X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fswfcombine.c;h=15061d807121e3479e98035285e4760c67d1db33;hb=bc0ce79fa28b82591900bd6449bd85ae7e549c03;hp=f190e9a593456b89c45e834a63cc8e3aba5eb62e;hpb=91f07304c9e9687652450f53938d76e1f60ddf76;p=swftools.git diff --git a/src/swfcombine.c b/src/swfcombine.c index f190e9a..15061d8 100644 --- a/src/swfcombine.c +++ b/src/swfcombine.c @@ -1,5 +1,5 @@ /* swfcombine.c - main routine for swfcombine(1), which is a tool for merging .swf-files. + main routine for swfcombine(1), a tool for merging .swf-files. Part of the swftools package. @@ -10,11 +10,15 @@ #include #include #include +#include +#include "../lib/rfxswf.h" #include "../lib/args.h" +#include "../lib/log.h" #include "combine.h" #include "settings.h" #include "types.h" #include "flash.h" +#include "reloc.h" #include "../config.h" char * master_filename = 0; @@ -86,6 +90,11 @@ int args_callback_option(char*name,char*val) { config.dummy = 1; return 0; } + else if (!strcmp(name, "z")) + { + config.zlib = 1; + return 0; + } else if (!strcmp(name, "r")) { config.framerate = atoi(val)*256/100; @@ -150,6 +159,7 @@ struct options_t options[] = {"V","version"}, {"c","clip"}, {"a","cat"}, + {"z","zlib"}, {0,0} }; @@ -219,19 +229,89 @@ void args_callback_usage(char*name) printf("-r framerate --rate Set movie framerate (100 frames/sec\n"); printf("-X width --width Force movie width to scale (default: use master width (not with -t\n"); printf("-Y height --height Force movie height to scale (default: use master height (not with -t\n"); + printf("-z zlib --zlib Enable Flash 6 (MX) Zlib Compression\n"); +} + +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); +} + +static char* fi_depack(FILE* fi, unsigned int * setlength) { + char * mem; + z_stream zs; + int ret; + char buffer1[8192], *buffer2; + int memsize = 8192; + int mempos = 0; + memset(&zs,0,sizeof(z_stream)); + zs.zalloc = Z_NULL; + zs.zfree = Z_NULL; + zs.opaque = Z_NULL; + buffer2 = malloc(8192); + + ret = inflateInit(&zs); + if (ret != Z_OK) zlib_error(ret, "inflate_init", &zs); + + fread(buffer2, 8, 1, fi); + buffer2[0] = 'F'; + + zs.next_out = &buffer2[8]; + zs.avail_out = 8192-8; + zs.avail_in = 0; + + while(1) + { + if(!zs.avail_in) { + zs.avail_in = fread(buffer1, 1, 8192, fi); + zs.next_in = buffer1; + } + if(zs.avail_in) + ret = inflate(&zs, Z_NO_FLUSH); + else + ret = inflate(&zs, Z_FINISH); + + if (ret == Z_STREAM_END) + break; + if (ret != Z_OK) zlib_error(ret, "inflate_init", &zs); + + if (zs.avail_out == 0) + { + buffer2 = realloc(buffer2, memsize + 8192); + zs.avail_out = 8192; + zs.next_out = &buffer2[memsize]; + memsize += 8192; + } + } + *setlength = (zs.next_out - (Bytef*)buffer2); + ret = inflateEnd(&zs); + if(ret != Z_OK) zlib_error(ret, "inflate_init", &zs); + return buffer2; } /* read a whole file in memory */ -char* fi_slurp(FILE*fi, unsigned int * setlength) +static char* fi_slurp(FILE*fi, unsigned int * setlength) { char * mem; long long int length; //;) long long int pos = 0; + unsigned char id[3]; fseek(fi,0,SEEK_END); length = ftell(fi); fseek(fi,0,SEEK_SET); - if(!length) + if(length<3) return 0; + fread(id, 3, 1, fi); + fseek(fi, 0, SEEK_SET); + if(!strncmp(id, "CWS", 3)) { + return fi_depack(fi, setlength); + } + mem = malloc(length); if(!mem) return 0; @@ -244,7 +324,54 @@ char* fi_slurp(FILE*fi, unsigned int * setlength) return mem; } -void fi_dump(FILE*fi, void*_mem, int length) +static void fi_pack(FILE*fi, void*_mem, int length) +{ + z_stream zs; + int ret; + char*mem = (char*)_mem; + char buffer[8192]; + memset(&zs,0,sizeof(z_stream)); + zs.zalloc = Z_NULL; + zs.zfree = Z_NULL; + zs.opaque = Z_NULL; + + ret = deflateInit(&zs, 9); + if (ret != Z_OK) zlib_error(ret, "deflate_init", &zs); + + mem[0] = 'C'; + fwrite(mem, 8, 1, fi); + + zs.avail_in = length-8; + zs.next_in = mem+8; + zs.avail_out = 8192; + zs.next_out = buffer; + + while(1) + { + if(zs.avail_in) + ret = deflate(&zs, Z_NO_FLUSH); + else + ret = deflate(&zs, Z_FINISH); + + if (ret == Z_STREAM_END) + break; + + if (ret != Z_OK) zlib_error(ret, "deflate_sync", &zs); + + if (zs.avail_out == 0) + { + fwrite(buffer, 8192, 1, fi); + zs.next_out = buffer; + zs.avail_out = 8192; + } + } + fwrite(buffer, zs.next_out - (Bytef*)buffer, 1, fi); + + ret = deflateEnd(&zs); + if (ret != Z_OK) zlib_error(ret, "deflate_end", &zs); +} + +static void fi_dump(FILE*fi, void*_mem, int length) { char*mem = (char*)_mem; int pos = 0; @@ -257,7 +384,8 @@ void fi_dump(FILE*fi, void*_mem, int length) } } -void makestackmaster(u8**masterdata, int*masterlength) +/* todo: use rfxswf */ +static void makestackmaster(u8**masterdata, int*masterlength) { u8 head[] = {'F','W','S'}; u8 *pos; @@ -274,6 +402,7 @@ void makestackmaster(u8**masterdata, int*masterlength) u8 data[256]; int ret; struct flash_header head; + struct reader_t r; strlength += strlen(slave_name[t]) + 9; if(!fi) { logf(" Couldn't open %s.", slave_filename[t]); @@ -284,8 +413,8 @@ void makestackmaster(u8**masterdata, int*masterlength) logf(" File %s is to small (%d bytes)", slave_filename[t], ret); exit(1); } - swf_init(data,256); - head = swf_read_header(); + swf_init(&r, data,256); + head = swf_read_header(&r); logf(" File %s has bounding box %d:%d:%d:%d\n", slave_filename[t], head.boundingBox.x1, head.boundingBox.y1, @@ -311,7 +440,6 @@ void makestackmaster(u8**masterdata, int*masterlength) } /* we don't have a master, so we create one ourselves. */ - /* (please notice the philosophical content) */ *masterlength = (numslaves + 1) * 32 + strlength; *masterdata = (u8*)malloc(*masterlength); pos = *masterdata; @@ -319,12 +447,12 @@ void makestackmaster(u8**masterdata, int*masterlength) pos += sizeof(head); *pos++ = fileversion; fixpos = (u32*)pos; - *(u32*)pos = 0x12345678; // to be overwritten + PUT32(pos, 0x12345678); // to be overwritten pos += 4; writeRECT(&pos, &box); - *(u16*)pos = 0x2000; // framerate + PUT16(pos, 0x2000) // framerate pos += 2; - *(u16*)pos = numslaves; + PUT16(pos, numslaves) // framerate pos += 2; for(t=0;t master entity %s (named \"%s\")\n", master_filename, master_name); fi = fopen(master_filename, "rb"); if(!fi) { - fprintf(stderr, "Failed to open %s\n", master_filename); - return 1; + logf(" Failed to open %s\n", master_filename); + exit(1); } masterdata = fi_slurp(fi, &masterlength); if(!masterdata) { - fprintf(stderr, "Failed to read from %s\n", master_filename); - return 1; + logf(" Failed to read from %s\n", master_filename); + exit(1); } logf(" Read %d bytes from masterfile\n", masterlength); fclose(fi); @@ -485,13 +614,13 @@ int main(int argn, char *argv[]) { fi = fopen(slave_filename[t], "rb"); if(!fi) { - fprintf(stderr, "Failed to open %s\n", slave_filename[t]); - return 1; + logf(" Failed to open %s\n", slave_filename[t]); + exit(1); } slavedata = fi_slurp(fi, &slavelength); if(!slavedata) { - fprintf(stderr, "Failed to read from %s\n", slave_filename[t]); - return 1; + logf(" Failed to read from %s\n", slave_filename[t]); + exit(1); } logf(" Read %d bytes from slavefile\n", slavelength); fclose(fi); @@ -503,11 +632,11 @@ int main(int argn, char *argv[]) slavedata[1] = 'W'; slavedata[2] = 'S'; slavedata[3] = 4; //version - *(u32*)&slavedata[4] = 14; // length + PUT32(&slavedata[4], 14); ; // length slavedata[8] = 0; // boundingbox - *(u16*)&slavedata[9] = 0; // rate - *(u16*)&slavedata[11] = 0; // count - *(u16*)&slavedata[13] = 0; // end tag + PUT16(&slavedata[9] , (0)); // rate + PUT16(&slavedata[11] , (0)); // count + PUT16(&slavedata[13] , (0)); // end tag slavelength = 17; } @@ -526,7 +655,10 @@ int main(int argn, char *argv[]) logf(" New File is %d bytes \n", newlength); if(newdata && newlength) { FILE*fi = fopen(outputname, "wb"); - fi_dump(fi, newdata, newlength); + if(config.zlib) + fi_pack(fi, newdata, newlength); + else + fi_dump(fi, newdata, newlength); fclose(fi); } return 0;