#include <stdlib.h>
#include <stdio.h>
#include <string.h>
+#include <zlib.h>
#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;
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;
{"V","version"},
{"c","clip"},
{"a","cat"},
+ {"z","zlib"},
{0,0}
};
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;
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;
}
/* todo: use rfxswf */
-void makestackmaster(u8**masterdata, int*masterlength)
+static void makestackmaster(u8**masterdata, int*masterlength)
{
u8 head[] = {'F','W','S'};
u8 *pos;
pos += sizeof(head);
*pos++ = fileversion;
fixpos = (u32*)pos;
- *(u32*)pos = SWAP32(0x12345678); // to be overwritten
+ PUT32(pos, 0x12345678); // to be overwritten
pos += 4;
writeRECT(&pos, &box);
- *(u16*)pos = SWAP16(0x2000); // framerate
+ PUT16(pos, 0x2000) // framerate
pos += 2;
- *(u16*)pos = SWAP16(numslaves);
+ PUT16(pos, numslaves) // framerate
pos += 2;
for(t=0;t<numslaves;t++)
{
}
namelen = strlen(slave_name[t]);
- *(u16*)&pos[0] = SWAP16((u16)(TAGID_DEFINESPRITE<<6) + 6);
- *(u16*)&pos[2] = SWAP16(t+1); //ID
- *(u16*)&pos[4] = 0; // Frames
- *(u16*)&pos[6] = 0; // TAG1
- *(u16*)&pos[8] = SWAP16((u16)(TAGID_PLACEOBJECT2<<6) + 6 + namelen);
- *(u16*)&pos[10]= SWAP16(34); //flags: id+name
- *(u16*)&pos[11]= SWAP16(1+t); // depth
- *(u16*)&pos[13]= SWAP16(t+1); // id
+ PUT16(&pos[0] , ((u16)(TAGID_DEFINESPRITE<<6) + 6));
+ PUT16(&pos[2] , (t+1)); //ID
+ PUT16(&pos[4] , 0); // Frames
+ PUT16(&pos[6] , 0); // TAG1
+ PUT16(&pos[8] , ((u16)(TAGID_PLACEOBJECT2<<6) + 6 + namelen));
+ PUT16(&pos[10], (34)); //flags: id+name
+ PUT16(&pos[11], (1+t)); // depth
+ PUT16(&pos[13], (t+1)); // id
sprintf(&pos[15],slave_name[t]);
pos += 15 + namelen + 1;
if(!config.stack1 || t == numslaves-1) {
- *(u16*)&pos[0]= SWAP16((u16)(TAGID_SHOWFRAME<<6) + 0);
+ PUT16(&pos[0],((u16)(TAGID_SHOWFRAME<<6) + 0));
pos += 2;
}
if(!config.stack)
if(t!=numslaves-1)
{
- *(u16*)&pos[0]= SWAP16((u16)(TAGID_REMOVEOBJECT2<<6) + 2);
- *(u16*)&pos[2]= SWAP16(1+t); // depth;
+ PUT16(&pos[0], ((u16)(TAGID_REMOVEOBJECT2<<6) + 2));
+ PUT16(&pos[2], (1+t)); // depth;
pos += 4;
}
}
- *(u16*)pos = SWAP16(TAGID_END<<6 + 0);
+ PUT16(pos, ((TAGID_END<<6) + 0));
*masterlength = pos - *masterdata;
- *fixpos = SWAP32(*masterlength);
+ PUT32(fixpos, *masterlength);
}
struct config_t config;
config.stack = 0;
config.stack1 = 0;
config.dummy = 0;
+ config.zlib = 0;
processargs(argn, argv);
initLog(0,-1,0,0,-1,config.loglevel);
logf("<verbose> 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("<fatal> 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("<fatal> Failed to read from %s\n", master_filename);
+ exit(1);
}
logf("<debug> Read %d bytes from masterfile\n", masterlength);
fclose(fi);
{
fi = fopen(slave_filename[t], "rb");
if(!fi) {
- fprintf(stderr, "Failed to open %s\n", slave_filename[t]);
- return 1;
+ logf("<fatal> 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("<fatal> Failed to read from %s\n", slave_filename[t]);
+ exit(1);
}
logf("<debug> Read %d bytes from slavefile\n", slavelength);
fclose(fi);
slavedata[1] = 'W';
slavedata[2] = 'S';
slavedata[3] = 4; //version
- *(u32*)&slavedata[4] = SWAP32(14); // length
+ PUT32(&slavedata[4], 14); ; // length
slavedata[8] = 0; // boundingbox
- *(u16*)&slavedata[9] = SWAP16(0); // rate
- *(u16*)&slavedata[11] = SWAP16(0); // count
- *(u16*)&slavedata[13] = SWAP16(0); // end tag
+ PUT16(&slavedata[9] , (0)); // rate
+ PUT16(&slavedata[11] , (0)); // count
+ PUT16(&slavedata[13] , (0)); // end tag
slavelength = 17;
}
logf("<debug> 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;
git.asbjorn.biz / swftools.git / blobdiff