X-Git-Url: http://git.asbjorn.biz/?p=swftools.git;a=blobdiff_plain;f=src%2Fswfcombine.c;h=7c675af9ba6a5d29260476fe0407ea82cb392d06;hp=628825d90c370a0056ac46bbc10181962331aefe;hb=aa4b3f6b8b77f87ea89f7d73c770cfb0232330b0;hpb=bd9310ce0e8ac12bc50ae077d8b2face9b53ca79 diff --git a/src/swfcombine.c b/src/swfcombine.c index 628825d..7c675af 100644 --- a/src/swfcombine.c +++ b/src/swfcombine.c @@ -3,9 +3,21 @@ Part of the swftools package. - Copyright (c) 2001 Matthias Kramm - - This file is distributed under the GPL, see file COPYING for details */ + Copyright (c) 2001,2002,2003 Matthias Kramm + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include #include @@ -91,12 +103,14 @@ int args_callback_option(char*name,char*val) { } else if (!strcmp(name, "x")) { - config.movex = atoi(val); + float x = atof(val); + config.movex = (int)(x*20+0.5); return 1; } else if (!strcmp(name, "y")) { - config.movey = atoi(val); + float y = atof(val); + config.movey = (int)(y*20+0.5); return 1; } else if (!strcmp(name, "m")) @@ -121,7 +135,13 @@ int args_callback_option(char*name,char*val) { } else if (!strcmp(name, "r")) { - config.framerate = atoi(val)*256/100; + + float rate = atof(val); + if ((rate < 1.0/256) ||(rate >= 256.0)) { + fprintf(stderr, "Error: You must specify a valid framerate between 1/256 and 255.\n"); + exit(1); + } + config.framerate = (int)(rate*256); return 1; } else if (!strcmp(name, "X")) @@ -219,7 +239,7 @@ int args_callback_command(char*name, char*val) { config.movex = config.movey = 0; config.scalex = config.scaley = 1.0; } else { - logf(" slave entity %s (named \"%s\")\n", filename, myname); + msg(" slave entity %s (named \"%s\")\n", filename, myname); slave_filename[numslaves] = filename; slave_name[numslaves] = myname; @@ -250,15 +270,15 @@ void args_callback_usage(char*name) printf("-a --cat concatenate all slave files (no master movie)\n"); printf("-l --overlay Don't remove any master objects, only overlay new objects\n"); printf("-c --clip Clip the slave objects by the corresponding master objects\n"); - printf("-v --verbose Use more than one -v for greater effect \n"); - printf("-d --dummy Don't require slave objects \n"); + printf("-v --verbose Be verbose. Use more than one -v for greater effect \n"); + printf("-d --dummy Don't require slave objects (for changing movie attributes)\n"); printf("-f --frame The following identifier is a frame or framelabel, not an id or objectname\n"); - printf("-x xpos --movex x Adjust position of slave by xpos twips (1/20 pixel)\n"); - printf("-y ypos --movey y Adjust position of slave by ypos twips (1/20 pixel)\n"); - printf("-s scale --scale Adjust size of slave by scale%\n"); - 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("-x xpos --movex x Adjust position of slave by xpos pixels\n"); + printf("-y ypos --movey y Adjust position of slave by ypos pixels\n"); + printf("-s scale --scale Adjust size of slave by scale% (e.g. 100%% = original size)\n"); + printf("-r framerate --rate Set movie framerate (frames/sec)\n"); + printf("-X width --width Force movie bbox width to scale (default: use master width (not with -t))\n"); + printf("-Y height --height Force movie bbox height to scale (default: use master height (not with -t))\n"); printf("-z zlib --zlib Enable Flash 6 (MX) Zlib Compression\n"); } @@ -278,14 +298,14 @@ static void makestackmaster(SWF*swf) { SWF head; int ret; - int fi=open(slave_filename[t],O_RDONLY); + int fi=open(slave_filename[t],O_RDONLY|O_BINARY); TAG*tag; if(fi<0 || swf_ReadSWF(fi, &head)<0) { - logf(" Couldn't open/read %s.", slave_filename[t]); + msg(" Couldn't open/read %s.", slave_filename[t]); exit(1); } close(fi); - logf(" File %s has bounding box %d:%d:%d:%d\n", + msg(" File %s has bounding box %d:%d:%d:%d\n", slave_filename[t], head.movieSize.xmin, head.movieSize.ymin, head.movieSize.xmax, head.movieSize.ymax); @@ -314,7 +334,7 @@ static void makestackmaster(SWF*swf) if(head.movieSize.ymax > box.ymax) box.ymax = head.movieSize.ymax; } - logf(" New master bounding box is %d:%d:%d:%d\n", + msg(" New master bounding box is %d:%d:%d:%d\n", box.xmin, box.ymin, box.xmax, box.ymax); swf_FreeTags(&head); @@ -353,13 +373,14 @@ static void makestackmaster(SWF*swf) } } tag = swf_InsertTag(tag, ST_END); - logf(" temporary SWF created"); + msg(" temporary SWF created"); } static char* slavename = 0; static int slaveid = -1; static int slaveframe = -1; static char masterbitmap[65536]; +static char depthbitmap[65536]; #define FLAGS_WRITEDEFINES 1 #define FLAGS_WRITENONDEFINES 2 @@ -415,7 +436,7 @@ void jpeg_assert(SWF*master, SWF*slave) } } if(spos && mpos) { - logf(" Master and slave have incompatible JPEGTABLES."); + msg(" Master and slave have incompatible JPEGTABLES."); } } @@ -424,17 +445,17 @@ TAG* write_sprite_defines(TAG*tag, SWF*sprite) TAG*rtag = sprite->firstTag; while(rtag && rtag->id!=ST_END) { if(!swf_isAllowedSpriteTag(rtag)) { - logf(" processing sprite tag %02x", tag->id); + msg(" processing sprite tag %02x", tag->id); if(swf_isDefiningTag(rtag)) { - logf(" [sprite defs] write tag %02x (%d bytes in body)", + msg(" [sprite defs] write tag %02x (%d bytes in body)", tag->id, tag->len); tag = swf_InsertTag(tag, rtag->id); swf_SetBlock(tag, rtag->data, rtag->len); } else if(swf_isPseudoDefiningTag(rtag)) { - logf(" [sprite defs] write tag %02x (%d bytes in body)", + msg(" [sprite defs] write tag %02x (%d bytes in body)", tag->id, tag->len); tag = swf_InsertTag(tag, rtag->id); swf_SetBlock(tag, rtag->data, rtag->len); @@ -450,21 +471,21 @@ TAG* write_sprite_defines(TAG*tag, SWF*sprite) swf_SetBlock(tag, rtag->data, rtag->len); break; case ST_EXPORTASSETS: - logf(" deliberately ignoring EXPORTASSETS tag"); + msg(" deliberately ignoring EXPORTASSETS tag"); break; case ST_ENABLEDEBUGGER: - logf(" deliberately ignoring ENABLEDEBUGGER tag"); + msg(" deliberately ignoring ENABLEDEBUGGER tag"); break; case ST_SETBACKGROUNDCOLOR: - logf(" deliberately ignoring BACKGROUNDCOLOR tag"); + msg(" deliberately ignoring BACKGROUNDCOLOR tag"); break; case 40: case 49: case 51: - logf(" found tag %d. This is a Generator template, isn't it?", tag->id); + msg(" found tag %d. This is a Generator template, isn't it?", tag->id); break; default: - logf(" funny tag: %d is neither defining nor sprite", tag->id); + msg(" funny tag: %d is neither defining nor sprite", tag->id); } } } @@ -486,17 +507,21 @@ void changedepth(TAG*tag, int add) PUT16(&tag->data[0],GET16(&tag->data[0])+add); } -void matrix_adjust(MATRIX*m, int movex, int movey, float scalex, float scaley) +void matrix_adjust(MATRIX*m, int movex, int movey, float scalex, float scaley, int scalepos) { m->sx = (int)(m->sx*scalex); m->sy = (int)(m->sy*scaley); m->r1 = (int)(m->r1*scalex); m->r0 = (int)(m->r0*scaley); + if(scalepos) { + m->tx *= scalex; + m->ty *= scaley; + } m->tx += movex; m->ty += movey; } -void write_changepos(TAG*output, TAG*tag, int movex, int movey, float scalex, float scaley) +void write_changepos(TAG*output, TAG*tag, int movex, int movey, float scalex, float scaley, int scalepos) { if(movex || movey || scalex != 1 || scaley != 1) { @@ -522,7 +547,7 @@ void write_changepos(TAG*output, TAG*tag, int movex, int movey, float scalex, fl } else { swf_GetMatrix(0, &m); } - matrix_adjust(&m, movex, movey, scalex, scaley); + matrix_adjust(&m, movex, movey, scalex, scaley, scalepos); swf_SetMatrix(output, &m); //swf_ResetReadBits(tag); @@ -535,7 +560,7 @@ void write_changepos(TAG*output, TAG*tag, int movex, int movey, float scalex, fl swf_SetU16(output, swf_GetU16(tag)); //depth swf_GetMatrix(tag, &m); - matrix_adjust(&m, movex, movey, scalex, scaley); + matrix_adjust(&m, movex, movey, scalex, scaley, scalepos); swf_SetMatrix(output, &m); //swf_ResetReadBits(tag); @@ -561,10 +586,10 @@ TAG* write_sprite(TAG*tag, SWF*sprite, int spriteid, int replaceddefine) definespritetag = tag = swf_InsertTag(tag, ST_DEFINESPRITE); swf_SetU16(tag, spriteid); swf_SetU16(tag, sprite->frameCount); - logf (" sprite id is %d", spriteid); + msg (" sprite id is %d", spriteid); tmp = sprite->frameCount; - logf(" %d frames to go",tmp); + msg(" %d frames to go",tmp); if(config.clip) { tag = swf_InsertTag(tag, ST_PLACEOBJECT2); @@ -586,17 +611,17 @@ TAG* write_sprite(TAG*tag, SWF*sprite, int spriteid, int replaceddefine) { if (swf_isAllowedSpriteTag(rtag)) { - logf(" [sprite main] write tag %02x (%d bytes in body)", + msg(" [sprite main] write tag %02x (%d bytes in body)", rtag->id, rtag->len); tag = swf_InsertTag(tag, rtag->id); - write_changepos(tag, rtag, config.movex, config.movey, config.scalex, config.scaley); + write_changepos(tag, rtag, config.movex, config.movey, config.scalex, config.scaley, 0); changedepth(tag, +2); if(tag->id == ST_SHOWFRAME) { tmp--; - logf(" %d frames to go",tmp); + msg(" %d frames to go",tmp); } } rtag = rtag->next; @@ -646,7 +671,7 @@ TAG* write_master(TAG*tag, SWF*master, SWF*slave, int spriteid, int replaceddefi if(swf_isDefiningTag(rtag) && (flags&FLAGS_WRITEDEFINES)) { - logf(" [master] write tag %02x (%d bytes in body)", + msg(" [master] write tag %02x (%d bytes in body)", rtag->id, rtag->len); if(swf_GetDefineID(rtag) == spriteid && !config.isframe) { @@ -657,7 +682,7 @@ TAG* write_master(TAG*tag, SWF*master, SWF*slave, int spriteid, int replaceddefi swf_SetDefineID(tag, replaceddefine); } else { /* don't write this tag */ - logf(" replacing tag %d id %d with sprite", rtag->id + msg(" replacing tag %d id %d with sprite", rtag->id ,spriteid); } @@ -686,7 +711,7 @@ TAG* write_master(TAG*tag, SWF*master, SWF*slave, int spriteid, int replaceddefi int id = get_free_id(masterbitmap); int depth = 0; if(config.clip) { - logf(" Can't combine --clip and --frame"); + msg(" Can't combine --clip and --frame"); } tag = write_sprite_defines(tag, slave); @@ -721,10 +746,10 @@ TAG* write_master(TAG*tag, SWF*master, SWF*slave, int spriteid, int replaceddefi break; } if(!dontwrite) { - logf(" [master] write tag %02x (%d bytes in body)", + msg(" [master] write tag %02x (%d bytes in body)", rtag->id, rtag->len); tag = swf_InsertTag(tag, rtag->id); - write_changepos(tag, rtag, config.mastermovex, config.mastermovey, config.masterscalex, config.masterscaley); + write_changepos(tag, rtag, config.mastermovex, config.mastermovey, config.masterscalex, config.masterscaley, 1); } } rtag = rtag->next; @@ -742,10 +767,10 @@ TAG* write_master(TAG*tag, SWF*master, SWF*slave, int spriteid, int replaceddefi if(!slavewritten && config.isframe && (flags&(FLAGS_WRITESLAVE|FLAGS_WRITESPRITE))) { if(slaveframe>=0) - logf(" Frame %d doesn't exist in file. No substitution will occur", + msg(" Frame %d doesn't exist in file. No substitution will occur", slaveframe); else - logf(" Frame \"%s\" doesn't exist in file. No substitution will occur", + msg(" Frame \"%s\" doesn't exist in file. No substitution will occur", slavename); } tag = swf_InsertTag(tag, ST_END); @@ -773,7 +798,7 @@ void catcombine(SWF*master, char*slave_name, SWF*slave, SWF*newswf) TAG*tag; TAG*mtag,*stag; if(config.isframe) { - logf(" Can't combine --cat and --frame"); + msg(" Can't combine --cat and --frame"); exit(1); } @@ -782,7 +807,7 @@ void catcombine(SWF*master, char*slave_name, SWF*slave, SWF*newswf) { if(swf_isDefiningTag(tag)) { int defineid = swf_GetDefineID(tag); - logf(" tagid %02x defines object %d", tag->id, defineid); + msg(" tagid %02x defines object %d", tag->id, defineid); masterbitmap[defineid] = 1; } tag = tag->next; @@ -798,7 +823,7 @@ void catcombine(SWF*master, char*slave_name, SWF*slave, SWF*newswf) depths = malloc(65536); if(!depths) { - logf(" Couldn't allocate %d bytes of memory", 65536); + msg(" Couldn't allocate %d bytes of memory", 65536); return; } memset(depths, 0, 65536); @@ -807,7 +832,7 @@ void catcombine(SWF*master, char*slave_name, SWF*slave, SWF*newswf) { int num=1; U16 depth; - logf(" [master] write tag %02x (%d bytes in body)", + msg(" [master] write tag %02x (%d bytes in body)", mtag->id, mtag->len); switch(mtag->id) { case ST_PLACEOBJECT2: @@ -847,7 +872,7 @@ void catcombine(SWF*master, char*slave_name, SWF*slave, SWF*newswf) stag = slave->firstTag; while(stag && stag->id!=ST_END) { - logf(" [slave] write tag %02x (%d bytes in body)", + msg(" [slave] write tag %02x (%d bytes in body)", stag->id, stag->len); tag = swf_InsertTag(tag, stag->id); swf_SetBlock(tag, stag->data, stag->len); @@ -867,18 +892,25 @@ void normalcombine(SWF*master, char*slave_name, SWF*slave, SWF*newswf) int frame = 0; char*framelabel; TAG * tag = master->firstTag; + + memset(depthbitmap, 0, sizeof(depthbitmap)); // set the idtab while(tag) { + int depth = swf_GetDepth(tag); + if(depth>=0) { + depthbitmap[depth] = 1; + } if(swf_isDefiningTag(tag)) { int defineid = swf_GetDefineID(tag); - logf(" tagid %02x defines object %d", tag->id, defineid); + msg(" tagid %02x defines object %d", tag->id, defineid); masterbitmap[defineid] = 1; + if (!slavename && defineid==slaveid) { if(defineid>=0) { spriteid = defineid; - logf(" Slave file attached to object %d.", defineid); + msg(" Slave file attached to object %d.", defineid); } } } else if(tag->id == ST_PLACEOBJECT2) { @@ -886,26 +918,26 @@ void normalcombine(SWF*master, char*slave_name, SWF*slave, SWF*newswf) int id = swf_GetPlaceID(tag); if(name) - logf(" tagid %02x places object %d named \"%s\"", tag->id, id, name); + msg(" tagid %02x places object %d named \"%s\"", tag->id, id, name); else - logf(" tagid %02x places object %d (no name)", tag->id, id); + msg(" tagid %02x places object %d (no name)", tag->id, id); if (name && slavename && !strcmp(name,slavename)) { if(id>=0) { spriteid = id; - logf(" Slave file attached to named object %s (%d).", name, id); + msg(" Slave file attached to named object %s (%d).", name, id); } } } else if(tag->id == ST_SHOWFRAME) { if(slaveframe>=0 && frame==slaveframe) { - logf(" Slave file attached to frame %d.", frame); + msg(" Slave file attached to frame %d.", frame); } frame++; } else if(tag->id == ST_FRAMELABEL) { char * name = tag->data; if(name && slavename && config.isframe && !strcmp(name, slavename)) { slaveframe = frame; - logf(" Slave file attached to frame %d (%s).", frame, name); + msg(" Slave file attached to frame %d (%s).", frame, name); } } tag = tag->next; @@ -914,14 +946,15 @@ void normalcombine(SWF*master, char*slave_name, SWF*slave, SWF*newswf) if (spriteid<0 && !config.isframe) { if(slavename) { if(strcmp(slavename,"!!dummy!!")) - logf(" Didn't find anything named %s in file. No substitutions will occur.", slavename); + msg(" Didn't find anything named %s in file. No substitutions will occur.", slavename); } else - logf(" Didn't find id %d in file. No substitutions will occur.", slaveid); + msg(" Didn't find id %d in file. No substitutions will occur.", slaveid); spriteid = get_free_id(masterbitmap); } swf_Relocate (slave, masterbitmap); + swf_RelocateDepth (slave, depthbitmap); jpeg_assert(slave, master); if (config.overlay) @@ -936,7 +969,7 @@ void normalcombine(SWF*master, char*slave_name, SWF*slave, SWF*newswf) if (config.antistream) { if (config.merge) { - logf(" Can't combine --antistream and --merge"); + msg(" Can't combine --antistream and --merge"); } tag = write_sprite_defines(tag, slave); tag = write_sprite(tag, slave, spriteid, replaceddefine); @@ -995,15 +1028,15 @@ void combine(SWF*master, char*slave_name, SWF*slave, SWF*newswf) } } - logf(" move x (%d)", config.movex); - logf(" move y (%d)", config.movey); - logf(" scale x (%f)", config.scalex); - logf(" scale y (%f)", config.scaley); - logf(" master move x (%d)", config.mastermovex); - logf(" master move y (%d)", config.mastermovey); - logf(" master scale x (%f)", config.masterscalex); - logf(" master scale y (%f)", config.masterscaley); - logf(" is frame (%d)", config.isframe); + msg(" move x (%d)", config.movex); + msg(" move y (%d)", config.movey); + msg(" scale x (%f)", config.scalex); + msg(" scale y (%f)", config.scaley); + msg(" master move x (%d)", config.mastermovex); + msg(" master move y (%d)", config.mastermovey); + msg(" master scale x (%f)", config.masterscalex); + msg(" master scale y (%f)", config.masterscaley); + msg(" is frame (%d)", config.isframe); memset(masterbitmap, 0, sizeof(masterbitmap)); @@ -1050,42 +1083,42 @@ int main(int argn, char *argv[]) initLog(0,-1,0,0,-1,config.loglevel); if(config.merge && config.cat) { - logf(" Can't combine --cat and --merge"); + msg(" Can't combine --cat and --merge"); exit(1); } if(config.stack) { if(config.overlay) { - logf(" Can't combine -l and -t"); + msg(" Can't combine -l and -t"); exit(1); } if(config.clip) { - logf(" Can't combine -c and -t"); + msg(" Can't combine -c and -t"); exit(1); } - logf(" (stacking) %d files found\n", numslaves); + msg(" (stacking) %d files found\n", numslaves); makestackmaster(&master); } else { int ret; - logf(" master entity %s (named \"%s\")\n", master_filename, master_name); - fi = open(master_filename, O_RDONLY); + msg(" master entity %s (named \"%s\")\n", master_filename, master_name); + fi = open(master_filename, O_RDONLY|O_BINARY); if(fi<0) { - logf(" Failed to open %s\n", master_filename); + msg(" Failed to open %s\n", master_filename); exit(1); } ret = swf_ReadSWF(fi, &master); if(ret<0) { - logf(" Failed to read from %s\n", master_filename); + msg(" Failed to read from %s\n", master_filename); exit(1); } - logf(" Read %d bytes from masterfile\n", ret); + msg(" Read %d bytes from masterfile\n", ret); close(fi); } for(t=0;t slave entity(%d) %s (%s \"%s\")\n", t+1, slave_filename[t], + msg(" slave entity(%d) %s (%s \"%s\")\n", t+1, slave_filename[t], slave_isframe[t]?"frame":"object", slave_name[t]); } @@ -1093,7 +1126,7 @@ int main(int argn, char *argv[]) { if(numslaves) { - logf(" --dummy (-d) implies there are zero slave objects. You supplied %d.", numslaves); + msg(" --dummy (-d) implies there are zero slave objects. You supplied %d.", numslaves); exit(1); } numslaves = 1; @@ -1117,9 +1150,9 @@ int main(int argn, char *argv[]) if (!numslaves) { if(config.cat) - logf(" You must have at least two objects."); + msg(" You must have at least two objects."); else - logf(" You must have at least one slave entity."); + msg(" You must have at least one slave entity."); return 0; } for(t = 0; t < numslaves; t++) @@ -1130,22 +1163,22 @@ int main(int argn, char *argv[]) config.scaley = slave_scaley[t]; config.isframe = slave_isframe[t]; - logf(" Combine [%s]%s and [%s]%s", master_name, master_filename, + msg(" Combine [%s]%s and [%s]%s", master_name, master_filename, slave_name[t], slave_filename[t]); if(!config.dummy) { int ret; - fi = open(slave_filename[t], O_RDONLY); + fi = open(slave_filename[t], O_RDONLY|O_BINARY); if(!fi) { - logf(" Failed to open %s\n", slave_filename[t]); + msg(" Failed to open %s\n", slave_filename[t]); exit(1); } ret = swf_ReadSWF(fi, &slave); if(ret<0) { - logf(" Failed to read from %s\n", slave_filename[t]); + msg(" Failed to read from %s\n", slave_filename[t]); exit(1); } - logf(" Read %d bytes from slavefile\n", ret); + msg(" Read %d bytes from slavefile\n", ret); close(fi); } else @@ -1162,7 +1195,7 @@ int main(int argn, char *argv[]) } } - fi = open(outputname, O_RDWR|O_TRUNC|O_CREAT, 0777); + fi = open(outputname, O_BINARY|O_RDWR|O_TRUNC|O_CREAT, 0777); if(config.zlib) swf_WriteSWC(fi, &newswf);