X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fswfcombine.c;h=9dedbf83fb408e8bfa7e6faddd007c142e92aca0;hb=ce77200a441ffa9ba65aee4308ba32daf014f74d;hp=03d6d95fa19a947b494c1c1392fc207a9fe962db;hpb=d85b2f74a1b0a98b31d8fb31d181b36903dd0d59;p=swftools.git diff --git a/src/swfcombine.c b/src/swfcombine.c index 03d6d95..9dedbf8 100644 --- a/src/swfcombine.c +++ b/src/swfcombine.c @@ -234,7 +234,7 @@ void args_callback_usage(char*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("-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"); @@ -259,14 +259,18 @@ static void makestackmaster(SWF*swf) int t; SRECT box; int fileversion = 1; + int frameRate = 256; + 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); + TAG*tag; if(fi<0 || swf_ReadSWF(fi, &head)<0) { logf(" Couldn't open/read %s.", slave_filename[t]); exit(1); @@ -276,6 +280,17 @@ static void makestackmaster(SWF*swf) 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) @@ -297,12 +312,13 @@ static void makestackmaster(SWF*swf) } memset(swf, 0, sizeof(SWF)); + swf->fileVersion = fileversion; + swf->movieSize = box; + swf->frameRate = frameRate; - swf->firstTag = swf_InsertTag(tag, ST_SETBACKGROUNDCOLOR); + 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"); } static char* slavename = 0; @@ -377,18 +394,18 @@ void jpeg_assert(SWF*master, SWF*slave) spos = stag; stag = stag->next; } - if(!mtag && !stag) + if(mpos && spos) { - if(stag->len == mtag->len && - !memcmp(stag->data, mtag->data, mtag->len)) + if(spos->len == mpos->len && + !memcmp(spos->data, mpos->data, mpos->len)) { // ok, both have jpegtables, but they're identical. // delete one and don't throw an error - swf_DeleteTag(stag); + swf_DeleteTag(spos); spos = 0; } } - if(spos>=0 && mpos>=0) { + if(spos && mpos) { logf(" Master and slave have incompatible JPEGTABLES."); } } @@ -489,7 +506,11 @@ void write_changepos(TAG*output, TAG*tag) swf_SetU16(output, swf_GetU16(tag)); //id } // flags & 4 - swf_GetMatrix(tag, &m); + if(flags&4) { + swf_GetMatrix(tag, &m); + } else { + swf_GetMatrix(0, &m); + } matrix_adjust(&m); swf_SetMatrix(output, &m); @@ -545,7 +566,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 } @@ -554,12 +575,12 @@ TAG* write_sprite(TAG*tag, SWF*sprite, int spriteid, int replaceddefine) { if (swf_isAllowedSpriteTag(rtag)) { - changedepth(rtag, +1); logf(" [sprite main] write tag %02x (%d bytes in body)", rtag->id, rtag->len); - tag = swf_InsertTag(tag, rtag->id); - write_changepos(rtag, tag); + write_changepos(tag, rtag); + + changedepth(tag, +2); if(tag->id == ST_SHOWFRAME) { @@ -694,7 +715,7 @@ TAG* write_master(TAG*tag, SWF*master, SWF*slave, int spriteid, int replaceddefi swf_SetBlock(tag, rtag->data, rtag->len); } } - tag = tag->next; + rtag = rtag->next; } if(outputslave) @@ -715,9 +736,24 @@ TAG* write_master(TAG*tag, SWF*master, SWF*slave, int spriteid, int replaceddefi logf(" Frame \"%s\" doesn't exist in file. No substitution will occur", slavename); } + tag = swf_InsertTag(tag, ST_END); return tag; } +void adjustheader(SWF*swf) +{ + if(config.framerate) + swf->frameRate = config.framerate; + if(config.hassizex) { + swf->movieSize.xmax = + swf->movieSize.xmin + config.sizex; + } + if(config.hassizey) { + swf->movieSize.ymax = + swf->movieSize.ymin + config.sizey; + } +} + void catcombine(SWF*master, char*slave_name, SWF*slave, SWF*newswf) { char* depths; @@ -737,13 +773,16 @@ void catcombine(SWF*master, char*slave_name, SWF*slave, SWF*newswf) logf(" tagid %02x defines object %d", tag->id, defineid); masterbitmap[defineid] = 1; } + tag = tag->next; } swf_Relocate(slave, masterbitmap); jpeg_assert(master, slave); memcpy(newswf, master, sizeof(SWF)); - tag = newswf->firstTag = swf_InsertTag(0, ST_REFLEX); + adjustheader(newswf); + + tag = newswf->firstTag = swf_InsertTag(0, ST_REFLEX); // to be removed later depths = malloc(65536); if(!depths) { @@ -752,7 +791,7 @@ void catcombine(SWF*master, char*slave_name, SWF*slave, SWF*newswf) } memset(depths, 0, 65536); mtag = master->firstTag; - while(mtag) + while(mtag && mtag->id!=ST_END) { int num=1; U16 depth; @@ -779,6 +818,8 @@ void catcombine(SWF*master, char*slave_name, SWF*slave, SWF*newswf) } tag = swf_InsertTag(tag, mtag->id); swf_SetBlock(tag, mtag->data, mtag->len); + + mtag = mtag->next; } for(t=0;t<65536;t++) @@ -792,7 +833,7 @@ void catcombine(SWF*master, char*slave_name, SWF*slave, SWF*newswf) free(depths); stag = slave->firstTag; - while(stag) + while(stag && stag->id!=ST_END) { logf(" [slave] write tag %02x (%d bytes in body)", stag->id, stag->len); @@ -800,6 +841,11 @@ void catcombine(SWF*master, char*slave_name, SWF*slave, SWF*newswf) swf_SetBlock(tag, stag->data, stag->len); stag = stag->next; } + tag = swf_InsertTag(tag, ST_END); + + tag = newswf->firstTag; + newswf->firstTag = newswf->firstTag->next; //remove temporary tag + swf_DeleteTag(tag); } void normalcombine(SWF*master, char*slave_name, SWF*slave, SWF*newswf) @@ -815,16 +861,16 @@ void normalcombine(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, defineid); + logf(" tagid %02x defines object %d", tag->id, defineid); masterbitmap[defineid] = 1; } else if(tag->id == ST_PLACEOBJECT2) { char * name = swf_GetName(tag); int id = swf_GetPlaceID(tag); if(name) - logf(" tagid %02x places object %d named \"%s\"", tag, id, name); + logf(" tagid %02x places object %d named \"%s\"", tag->id, id, name); else - logf(" tagid %02x places object %d (no name)", tag, id); + logf(" tagid %02x places object %d (no name)", tag->id, id); if ((name && slavename && !strcmp(name,slavename)) || (!slavename && id==slaveid)) { @@ -867,7 +913,9 @@ void normalcombine(SWF*master, char*slave_name, SWF*slave, SWF*newswf) // write file memcpy(newswf, master, sizeof(SWF)); - newswf->firstTag = tag = swf_InsertTag(0, ST_REFLEX); + adjustheader(newswf); + + newswf->firstTag = tag = swf_InsertTag(0, ST_REFLEX); // to be removed later if (config.antistream) { if (config.merge) { @@ -885,6 +933,10 @@ void normalcombine(SWF*master, char*slave_name, SWF*slave, SWF*newswf) tag = write_master(tag, master, slave, spriteid, replaceddefine, FLAGS_WRITEDEFINES|FLAGS_WRITENONDEFINES|FLAGS_WRITESPRITE); } + + tag = newswf->firstTag; + newswf->firstTag = newswf->firstTag->next; //remove temporary tag + swf_DeleteTag(tag); } void combine(SWF*master, char*slave_name, SWF*slave, SWF*newswf) @@ -1085,11 +1137,14 @@ int main(int argn, char *argv[]) } } - fi = open(outputname, O_RDWR|O_TRUNC|O_CREAT); + fi = open(outputname, O_RDWR|O_TRUNC|O_CREAT, 0777); + if(config.zlib) swf_WriteSWC(fi, &newswf); - else + else { + newswf.compressed = 0; swf_WriteSWF(fi, &newswf); + } close(fi); return 0; }