X-Git-Url: http://git.asbjorn.biz/?p=swftools.git;a=blobdiff_plain;f=src%2Fswfcombine.c;h=7daec9c8a1ad2ff20875e6712addde081ea7ef64;hp=ce578af9d89f30fbec84ab86d3c55614140055c8;hb=2391d7ae5d8a145a250a8b80ab8c93ba74eba030;hpb=93e78ef02b9918ccfa86f0e4d446e503cbec1fe1 diff --git a/src/swfcombine.c b/src/swfcombine.c index ce578af..7daec9c 100644 --- a/src/swfcombine.c +++ b/src/swfcombine.c @@ -3,14 +3,25 @@ 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 #include -#include #include "../lib/rfxswf.h" #include "../lib/args.h" #include "../lib/log.h" @@ -29,16 +40,25 @@ struct config_t char cat; char merge; char isframe; + char local_with_networking; + char local_with_filesystem; + char accelerated_blit; + char hardware_gpu; int loglevel; - int movex; - int movey; int sizex; char hassizex; int sizey; char hassizey; + int flashversion; int framerate; + int movex; + int movey; float scalex; float scaley; + int mastermovex; + int mastermovey; + float masterscalex; + float masterscaley; }; struct config_t config; @@ -88,12 +108,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")) @@ -118,7 +140,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 < 0) ||(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")) @@ -138,6 +166,36 @@ int args_callback_option(char*name,char*val) { config.scalex = config.scaley = atoi(val)/100.0; return 1; } + else if (!strcmp(name, "w")) + { + config.scalex = atoi(val)/100.0; + return 1; + } + else if (!strcmp(name, "h")) + { + config.scaley = atoi(val)/100.0; + return 1; + } + else if (!strcmp(name, "N")) + { + config.local_with_networking = 1; + return 0; + } + else if (!strcmp(name, "L")) + { + config.local_with_filesystem = 1; + return 0; + } + else if (!strcmp(name, "B")) + { + config.accelerated_blit = 1; + return 0; + } + else if (!strcmp(name, "G")) + { + config.hardware_gpu = 1; + return 0; + } else if (!strcmp(name, "t") || !strcmp(name, "T")) { if(master_filename) { @@ -162,26 +220,30 @@ int args_callback_option(char*name,char*val) { } } -struct options_t options[] = -{{"o","output"}, - {"s","scale"}, - {"d","dummy"}, - {"x","xpos"}, - {"y","ypos"}, - {"X","width"}, - {"Y","height"}, - {"r","rate"}, - {"f","frame"}, - {"l","overlay"}, - {"m","merge"}, - {"t","stack"}, - {"T","stack1"}, - {"v","verbose"}, - {"V","version"}, - {"c","clip"}, - {"a","cat"}, - {"z","zlib"}, - {0,0} +static struct options_t options[] = { +{"o", "output"}, +{"t", "stack"}, +{"T", "stack1"}, +{"m", "merge"}, +{"a", "cat"}, +{"l", "overlay"}, +{"c", "clip"}, +{"v", "verbose"}, +{"F", "flashversion"}, +{"d", "dummy"}, +{"f", "frame"}, +{"x", "movex"}, +{"y", "movey"}, +{"s", "scale"}, +{"r", "rate"}, +{"X", "width"}, +{"Y", "height"}, +{"N", "local-with-networking"}, +{"G", "hardware-gpu"}, +{"B", "accelerated-blit"}, +{"L", "local-with-filesystem"}, +{"z", "zlib"}, +{0,0} }; int args_callback_longoption(char*name,char*val) { @@ -209,8 +271,14 @@ int args_callback_command(char*name, char*val) { if(!master_filename) { master_filename = filename; master_name = myname; + config.mastermovex = config.movex; + config.mastermovey = config.movey; + config.masterscalex = config.scalex; + config.masterscaley = config.scaley; + 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; @@ -227,30 +295,51 @@ int args_callback_command(char*name, char*val) { return 0; } -void args_callback_usage(char*name) +void args_callback_usage(char *name) { + printf("\n"); printf("Usage: %s [-rXYomlcv] [-f] masterfile [-xysf] [(name1|#id1)=]slavefile1 .. [-xysf] [(nameN|#idN)=]slavefileN\n", name); printf("OR: %s [-rXYomv] --stack[1] [-xysf] [(name1|#id1)=]slavefile1 .. [-xysf] [(nameN|#idN)=]slavefileN\n", name); printf("OR: %s [-rXYov] --cat [-xysf] [(name1|#id1)=]slavefile1 .. [-xysf] [(nameN|#idN)=]slavefileN\n", name); printf("OR: %s [-rXYomlcv] --dummy [-xys] [file]\n", name); printf("\n"); - printf("-o outputfile --output explicitly specify output file. (otherwise, output.swf will be used\n"); - printf("-t --stack place each slave in a seperate frame (no master movie)\n"); - printf("-T --stack1 place each slave in the first frame (no master movie)\n"); - printf("-m --merge Don't store the slaves in Sprites/MovieClips\n"); - 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("-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("-z zlib --zlib Enable Flash 6 (MX) Zlib Compression\n"); + printf("-o , --output explicitly specify output file. (otherwise, output.swf will be used)\n"); + printf("-t , --stack place each slave in a seperate frame (no master movie)\n"); + printf("-T , --stack1 place each slave in the first frame (no master movie)\n"); + printf("-m , --merge Don't store the slaves in Sprites/MovieClips\n"); + 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 Be verbose. Use more than one -v for greater effect \n"); + printf("-F , --flashversion Set the flash version of the output file.\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 , --movex x Adjust position of slave by pixels\n"); + printf("-y , --movey y Adjust position of slave by pixels\n"); + printf("-s , --scale Adjust size of slave by percent (e.g. 100%% = original size)\n"); + printf("-r , --rate Set movie framerate to (frames/sec)\n"); + printf("-X , --width Force movie bbox width to (default: use master width (not with -t))\n"); + printf("-Y , --height Force movie bbox height to (default: use master height (not with -t))\n"); + printf("-N , --local-with-networking Make output file \"local-with-networking\"\n"); + printf("-G , --hardware-gpu Set the \"use hardware gpu\" bit in the output file\n"); + printf("-B , --accelerated-blit Set the \"use accelerated blit\" bit in the output file\n"); + printf("-L , --local-with-filesystem Make output file \"local-with-filesystem\"\n"); + printf("-z , --zlib Enable Flash 6 (MX) Zlib Compression\n"); + printf("\n"); +} + +void removeCommonTags(SWF * swf) +{ + TAG*tag = swf->firstTag; + while(tag) { + if(tag->id == ST_SCENEDESCRIPTION || + tag->id == ST_FILEATTRIBUTES || + tag->id == ST_REFLEX) { + tag = swf_DeleteTag(swf, tag); + } else { + tag = tag->next; + } + } } static void makestackmaster(SWF*swf) @@ -258,24 +347,44 @@ static void makestackmaster(SWF*swf) TAG*tag; int t; SRECT box; - int fileversion = 1; + int fileversion = config.zlib?6:3; + int frameRate = 256; + U32 fileAttributes = 0; + RGBA rgb; + rgb.r=rgb.b=rgb.g=0; memset(&box, 0, sizeof(box)); /* scan all slaves for bounding box */ - for(t=0;t=0;t--) { 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", + swf_RemoveJPEGTables(&head); + fileAttributes |= head.fileAttributes; + removeCommonTags(&head); + + 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); + + tag = head.firstTag; + while(tag) { + if(tag->id == ST_SETBACKGROUNDCOLOR && tag->len>=3) { + rgb.r = tag->data[0]; + rgb.g = tag->data[1]; + rgb.b = tag->data[2]; + } + tag=tag->next; + } + frameRate = head.frameRate; if(head.fileVersion > fileversion) fileversion = head.fileVersion; if(!t) @@ -290,19 +399,21 @@ 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); } memset(swf, 0, sizeof(SWF)); + swf->fileVersion = fileversion; + swf->movieSize = box; + swf->frameRate = frameRate; + swf->fileAttributes = fileAttributes; swf->firstTag = swf_InsertTag(0, ST_SETBACKGROUNDCOLOR); tag = swf->firstTag; - swf_SetU8(tag, 0); - swf_SetU8(tag, 0); - swf_SetU8(tag, 0); + swf_SetRGB(tag, &rgb); for(t=0;t 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 @@ -385,12 +497,12 @@ void jpeg_assert(SWF*master, SWF*slave) { // ok, both have jpegtables, but they're identical. // delete one and don't throw an error - swf_DeleteTag(spos); + swf_DeleteTag(slave, spos); spos = 0; } } if(spos && mpos) { - logf(" Master and slave have incompatible JPEGTABLES."); + msg(" Master and slave have incompatible JPEGTABLES."); } } @@ -399,17 +511,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); @@ -425,21 +537,27 @@ 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 ST_SHOWFRAME: + msg(" deliberately ignoring SHOWFRAME tag"); + break; + case ST_REFLEX: + msg(" deliberately ignoring REFLEX 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?", rtag->id); break; default: - logf(" funny tag: %d is neither defining nor sprite", tag->id); + msg(" funny tag: %d is neither defining nor sprite", rtag->id); } } } @@ -450,7 +568,6 @@ TAG* write_sprite_defines(TAG*tag, SWF*sprite) void changedepth(TAG*tag, int add) { - /* fucking byteorders */ if(tag->id == ST_PLACEOBJECT) PUT16(&tag->data[2],GET16(&tag->data[2])+add); if(tag->id == ST_PLACEOBJECT2) @@ -459,21 +576,42 @@ void changedepth(TAG*tag, int add) PUT16(&tag->data[2],GET16(&tag->data[2])+add); if(tag->id == ST_REMOVEOBJECT2) PUT16(&tag->data[0],GET16(&tag->data[0])+add); + if(tag->id == ST_PLACEOBJECT2) { + SWFPLACEOBJECT obj; + U8 flags; + swf_SetTagPos(tag, 0); + flags = swf_GetU8(tag); + if(flags&2) swf_GetU16(tag); //id + if(flags&4) swf_GetMatrix(tag, 0); + if(flags&8) swf_GetCXForm(tag, 0,1); + if(flags&16) swf_GetU16(tag); //ratio + if(flags&64) { + swf_ResetReadBits(tag); + printf("%d->%d\n", GET16(&tag->data[tag->pos]), + GET16(&tag->data[tag->pos])+add); + PUT16(&tag->data[tag->pos],GET16(&tag->data[tag->pos])+add); + } + msg(" Depth relocation not fully working yet with clipdepths", tag->id); + } } -void matrix_adjust(MATRIX*m) +void matrix_adjust(MATRIX*m, int movex, int movey, float scalex, float scaley, int scalepos) { - m->sx = (int)(m->sx*config.scalex); - m->sy = (int)(m->sy*config.scaley); - m->r0 = (int)(m->r0*config.scalex); - m->r1 = (int)(m->r1*config.scaley); - m->tx += config.movex; - m->ty += config.movey; + 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) +void write_changepos(TAG*output, TAG*tag, int movex, int movey, float scalex, float scaley, int scalepos) { - if(config.movex || config.movey || config.scalex != 1 || config.scaley != 1) + if(movex || movey || scalex != 1.0 || scaley != 1.0) { switch(tag->id) { @@ -481,6 +619,8 @@ void write_changepos(TAG*output, TAG*tag) MATRIX m; U8 flags; swf_GetMatrix(0, &m); + tag->pos = 0; + tag->readBit = 0; flags = swf_GetU8(tag); swf_SetU8(output, flags|4); @@ -490,11 +630,16 @@ void write_changepos(TAG*output, TAG*tag) swf_SetU16(output, swf_GetU16(tag)); //id } // flags & 4 - swf_GetMatrix(tag, &m); - matrix_adjust(&m); + if(flags&4) { + swf_GetMatrix(tag, &m); + } else { + swf_GetMatrix(0, &m); + } + matrix_adjust(&m, movex, movey, scalex, scaley, scalepos); swf_SetMatrix(output, &m); - //swf_ResetReadBits(tag); + if (tag->readBit) { tag->pos++; tag->readBit = 0; } //swf_ResetReadBits(tag); + swf_SetBlock(output, &tag->data[tag->pos], tag->len - tag->pos); break; } @@ -504,10 +649,11 @@ void write_changepos(TAG*output, TAG*tag) swf_SetU16(output, swf_GetU16(tag)); //depth swf_GetMatrix(tag, &m); - matrix_adjust(&m); + matrix_adjust(&m, movex, movey, scalex, scaley, scalepos); swf_SetMatrix(output, &m); - //swf_ResetReadBits(tag); + if (tag->readBit) { tag->pos++; tag->readBit = 0; } //swf_ResetReadBits(tag); + swf_SetBlock(output, &tag->data[tag->pos], tag->len - tag->pos); break; } @@ -530,10 +676,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); @@ -546,7 +692,7 @@ TAG* write_sprite(TAG*tag, SWF*sprite, int spriteid, int replaceddefine) if(config.overlay && !config.isframe) { tag = swf_InsertTag(tag, ST_PLACEOBJECT2); swf_SetU8(tag, 2); //flags: character - swf_SetU16(tag, 0); //depth + swf_SetU16(tag, 1); //depth swf_SetU16(tag, replaceddefine); //id } @@ -555,17 +701,18 @@ 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); - - changedepth(tag, +1); + write_changepos(tag, rtag, config.movex, config.movey, config.scalex, config.scaley, 0); + + if(config.clip || (config.overlay && !config.isframe)) + changedepth(tag, +2); if(tag->id == ST_SHOWFRAME) { tmp--; - logf(" %d frames to go",tmp); + msg(" %d frames to go",tmp); } } rtag = rtag->next; @@ -584,9 +731,10 @@ static char tag_ok_for_slave(int id) TAG* write_master(TAG*tag, SWF*master, SWF*slave, int spriteid, int replaceddefine, int flags) { int outputslave = 0; - int frame = 0; + int frame = 1; int sframe = 0; int slavewritten = 0; + int deletedepth = -1; TAG* rtag = master->firstTag; TAG* stag = slave->firstTag; @@ -603,7 +751,7 @@ TAG* write_master(TAG*tag, SWF*master, SWF*slave, int spriteid, int replaceddefi } if(tag_ok_for_slave(stag->id)) { tag = swf_InsertTag(tag, stag->id); - swf_SetBlock(tag, stag->data, stag->len); + write_changepos(tag, stag, config.movex, config.movey, config.scalex, config.scaley, 0); } stag = stag->next; } @@ -611,11 +759,19 @@ TAG* write_master(TAG*tag, SWF*master, SWF*slave, int spriteid, int replaceddefi if(rtag->id == ST_SHOWFRAME) { frame ++; + tag = swf_InsertTag(tag, ST_SHOWFRAME); + if(deletedepth>=0) { + tag = swf_InsertTag(tag, ST_REMOVEOBJECT2); + swf_SetU16(tag, deletedepth); + deletedepth=-1; + } + rtag = rtag->next; + continue; } 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) { @@ -626,17 +782,19 @@ 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 - ,spriteid); + msg(" replacing tag %d ID %d with sprite", rtag->id ,spriteid); } if(flags&FLAGS_WRITESPRITE) { + msg(" writing sprite defines"); tag = write_sprite_defines(tag, slave); + msg(" writing sprite"); tag = write_sprite(tag, slave, spriteid, replaceddefine); } if(flags&FLAGS_WRITESLAVE) { + msg(" writing slave"); outputslave = 1; } } else { @@ -644,7 +802,7 @@ TAG* write_master(TAG*tag, SWF*master, SWF*slave, int spriteid, int replaceddefi swf_SetBlock(tag, rtag->data, rtag->len); } } - if(frame == slaveframe) + if(frame == slaveframe) /* only happens with config.isframe: put slave at specific frame */ { if(flags&FLAGS_WRITESLAVE) { outputslave = 1; @@ -653,9 +811,10 @@ TAG* write_master(TAG*tag, SWF*master, SWF*slave, int spriteid, int replaceddefi if((flags&FLAGS_WRITESPRITE) && !slavewritten) { int id = get_free_id(masterbitmap); - int depth = 0; + int depth = 65535; + deletedepth = 65535; if(config.clip) { - logf(" Can't combine --clip and --frame"); + msg(" Can't combine --clip and --frame"); } tag = write_sprite_defines(tag, slave); @@ -678,7 +837,6 @@ TAG* write_master(TAG*tag, SWF*master, SWF*slave, int spriteid, int replaceddefi if(frame == slaveframe && !config.overlay) dontwrite = 1; case ST_REMOVEOBJECT: -// case ST_REMOVEOBJECT2: /* place/removetags for the object we replaced should be discarded, too, as the object to insert isn't a sprite @@ -687,12 +845,15 @@ TAG* write_master(TAG*tag, SWF*master, SWF*slave, int spriteid, int replaceddefi !config.isframe && config.merge) dontwrite = 1; break; + case ST_REMOVEOBJECT2: + 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); - swf_SetBlock(tag, rtag->data, rtag->len); + write_changepos(tag, rtag, config.mastermovex, config.mastermovey, config.masterscalex, config.masterscaley, 1); + } } rtag = rtag->next; @@ -702,18 +863,19 @@ TAG* write_master(TAG*tag, SWF*master, SWF*slave, int spriteid, int replaceddefi while(stag && stag->id!=ST_END) { if(tag_ok_for_slave(stag->id)) { + msg(" [slave] write tag %02x (%d bytes in body), %.2f %.2f", rtag->id, rtag->len, config.movex /20.0, config.movey /20.0); tag = swf_InsertTag(tag, stag->id); - swf_SetBlock(tag, stag->data, stag->len); + write_changepos(tag, stag, config.movex, config.movey, config.scalex, config.scaley, 0); } stag = stag->next; } 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); @@ -732,6 +894,8 @@ void adjustheader(SWF*swf) swf->movieSize.ymax = swf->movieSize.ymin + config.sizey; } + if(config.flashversion) + swf->fileVersion = config.flashversion; } void catcombine(SWF*master, char*slave_name, SWF*slave, SWF*newswf) @@ -741,16 +905,18 @@ 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); } + if(config.flashversion) + master->fileVersion = config.flashversion; tag = master->firstTag; while(tag) { 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; @@ -766,7 +932,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); @@ -775,7 +941,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: @@ -815,7 +981,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); @@ -823,9 +989,7 @@ void catcombine(SWF*master, char*slave_name, SWF*slave, SWF*newswf) } tag = swf_InsertTag(tag, ST_END); - tag = newswf->firstTag; - newswf->firstTag = newswf->firstTag->next; //remove temporary tag - swf_DeleteTag(tag); + swf_DeleteTag(newswf, tag); } void normalcombine(SWF*master, char*slave_name, SWF*slave, SWF*newswf) @@ -835,40 +999,84 @@ 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; + msg(" Slave file attached to object %d.", defineid); + } + } + } else if(tag->id == ST_EXPORTASSETS) { + int t; + int num = swf_GetU16(tag); + for(t=0;t Slave file attached to object %d exported as %s.", id, name); + } + } + } else if(tag->id == ST_SYMBOLCLASS) { + /* a symbolclass tag is like a define tag: it defines id 0000 */ + int num = swf_GetU16(tag); + int t; + for(t=0;tid == ST_PLACEOBJECT2) { char * name = swf_GetName(tag); int id = swf_GetPlaceID(tag); + { + SWFPLACEOBJECT obj; + swf_GetPlaceObject(tag, &obj); + swf_PlaceObjectFree(&obj); + if(obj.clipdepth) { + depthbitmap[obj.clipdepth] = 1; + } + } + 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)) || - (!slavename && id==slaveid)) { + if (name && slavename && !strcmp(name,slavename)) { if(id>=0) { spriteid = id; - logf(" Slave file attached to object %d.", 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; @@ -876,15 +1084,22 @@ 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); + if(strcmp(slavename,"!!dummy!!")) { + msg(" Didn't find anything named %s in file. No substitutions will occur.", slavename); + if(!strcmp(slavename, "swf")) { + msg(" (If you were trying to combine rfxview with a document, try replacing 'swf' with 'viewport'."); + } + } } 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); + + if(config.merge) + swf_RelocateDepth (slave, depthbitmap); jpeg_assert(slave, master); if (config.overlay) @@ -899,7 +1114,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); @@ -908,15 +1123,13 @@ void normalcombine(SWF*master, char*slave_name, SWF*slave, SWF*newswf) } else { if (config.merge) tag = write_master(tag, master, slave, spriteid, replaceddefine, - FLAGS_WRITEDEFINES|FLAGS_WRITENONDEFINES|FLAGS_WRITESLAVE); + FLAGS_WRITEDEFINES|FLAGS_WRITENONDEFINES| FLAGS_WRITESLAVE ); else tag = write_master(tag, master, slave, spriteid, replaceddefine, - FLAGS_WRITEDEFINES|FLAGS_WRITENONDEFINES|FLAGS_WRITESPRITE); + FLAGS_WRITEDEFINES|FLAGS_WRITENONDEFINES| FLAGS_WRITESPRITE ); } - tag = newswf->firstTag; - newswf->firstTag = newswf->firstTag->next; //remove temporary tag - swf_DeleteTag(tag); + swf_DeleteTag(newswf, newswf->firstTag); } void combine(SWF*master, char*slave_name, SWF*slave, SWF*newswf) @@ -925,6 +1138,11 @@ void combine(SWF*master, char*slave_name, SWF*slave, SWF*newswf) slaveid = -1; slaveframe = -1; + if(!master->fileVersion && slave) + master->fileVersion = slave->fileVersion; + + master->fileAttributes |= slave->fileAttributes; + swf_FoldAll(master); swf_FoldAll(slave); @@ -936,16 +1154,19 @@ void combine(SWF*master, char*slave_name, SWF*slave, SWF*newswf) if(config.isframe) { - int tmp; - if(slavename && slavename[0]!='#' && (sscanf(slavename, "%d", &tmp) == - strlen(slavename))) { - /* if the name the slave should replace - consists only of digits and the -f - option is given, it probably is not - a frame name but a frame number. - */ - slaveid = tmp; - slavename = 0; + if(slavename && slavename[0]!='#') { + int tmp; + int len; + sscanf(slavename, "%d%n", &tmp, &len); + if(len == strlen(slavename)) { + /* if the name the slave should replace + consists only of digits and the -f + option is given, it probably is not + a frame name but a frame number. + */ + slaveid = tmp; + slavename = 0; + } } if(slaveid>=0) { @@ -953,16 +1174,20 @@ void combine(SWF*master, char*slave_name, SWF*slave, SWF*newswf) slaveid = -1; } else { /* if id wasn't given as either #number or number, - the name is a frame label. BTW: The user wouldn't have + the name is a frame label. BTW: The user wouldn't necessarily have needed to supply the -f option in this case */ } } - 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(" 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)); @@ -993,6 +1218,10 @@ int main(int argn, char *argv[]) config.scaley = 1.0; config.sizex = 0; config.sizey = 0; + config.masterscalex = 1.0; + config.masterscaley = 1.0; + config.mastermovex = 0; + config.mastermovey = 0; config.hassizex = 0; config.hassizey = 0; config.framerate = 0; @@ -1005,42 +1234,49 @@ 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 && config.cat) { + msg(" Can't combine --cat and --stack"); 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); + swf_RemoveJPEGTables(&master); + removeCommonTags(&master); + 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]); } @@ -1048,7 +1284,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; @@ -1072,9 +1308,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++) @@ -1085,47 +1321,71 @@ 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); + swf_RemoveJPEGTables(&slave); + removeCommonTags(&slave); } else { memset(&slave, 0, sizeof(slave)); slave.firstTag = swf_InsertTag(0, ST_END); slave.frameRate = 0; - slave.fileVersion = 4; + slave.fileVersion = 0; slave.frameCount = 0; } combine(&master, slave_name[t], &slave, &newswf); master = newswf; } + if(config.dummy && !config.hassizex && !config.hassizey && !config.mastermovex && !config.mastermovey) { + newswf.movieSize.xmin = newswf.movieSize.xmin*config.masterscalex; + newswf.movieSize.ymin = newswf.movieSize.ymin*config.masterscaley; + newswf.movieSize.xmax = newswf.movieSize.xmax*config.masterscalex; + newswf.movieSize.ymax = newswf.movieSize.ymax*config.masterscaley; + } } - fi = open(outputname, O_RDWR|O_TRUNC|O_CREAT, 0777); + if(!newswf.fileVersion) + newswf.fileVersion = 4; - if(config.zlib) - swf_WriteSWC(fi, &newswf); - else { - newswf.compressed = 0; + if(config.local_with_filesystem) + newswf.fileAttributes &= ~FILEATTRIBUTE_USENETWORK; + if(config.local_with_networking) + newswf.fileAttributes |= FILEATTRIBUTE_USENETWORK; + if(config.accelerated_blit) + newswf.fileAttributes |= FILEATTRIBUTE_USEACCELERATEDBLIT; + if(config.hardware_gpu) + newswf.fileAttributes |= FILEATTRIBUTE_USEHARDWAREGPU; + + fi = open(outputname, O_BINARY|O_RDWR|O_TRUNC|O_CREAT, 0777); + + if(config.zlib) { + if(newswf.fileVersion < 6) + newswf.fileVersion = 6; + newswf.compressed = 1; + swf_WriteSWF(fi, &newswf); + } else { + newswf.compressed = -1; // don't compress swf_WriteSWF(fi, &newswf); } close(fi); - return 0; + + return 0; //ok }