X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fswfcombine.c;h=a552fd84d03568d13ad0588622f2b4ddb987c546;hb=3f73c91e5e0dce1ae64a347613743a2974b53672;hp=1fad28d75af08a3622de4d5accbb7b64d155bf10;hpb=c9b3f16f20729e72788ff3351dad975c96f6bba1;p=swftools.git diff --git a/src/swfcombine.c b/src/swfcombine.c index 1fad28d..a552fd8 100644 --- a/src/swfcombine.c +++ b/src/swfcombine.c @@ -298,7 +298,7 @@ static void makestackmaster(SWF*swf) memset(swf, 0, sizeof(SWF)); - 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); @@ -328,6 +328,7 @@ static void makestackmaster(SWF*swf) } } tag = swf_InsertTag(tag, ST_END); + logf(" temporary SWF created"); } static char* slavename = 0; @@ -343,7 +344,7 @@ static char masterbitmap[65536]; int get_free_id(char*bitmap) { int t; - for(t=1;t<65537;t++) + for(t=1;t<65536;t++) if(!bitmap[t]) { bitmap[t] = 1; return t; @@ -351,15 +352,52 @@ int get_free_id(char*bitmap) return -1; } -void jpeg_assert() +void jpeg_assert(SWF*master, SWF*slave) { + /* TODO: if there's a jpegtable found, store it + and handle it together with the flash file + headers */ + + /* check that master and slave don't have both + jpegtables (which would be fatal) */ + int pos; + TAG *mpos=0, *spos=0; + TAG *mtag,*stag; + pos = 0; + mtag = master->firstTag; + stag = slave->firstTag; + while(mtag) + { + if(mtag->id == ST_JPEGTABLES) + mpos = mtag; + mtag = mtag->next; + } + while(stag) + { + if(stag->id == ST_JPEGTABLES) + spos = stag; + stag = stag->next; + } + if(mpos && spos) + { + 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(spos); + spos = 0; + } + } + if(spos && mpos) { + logf(" Master and slave have incompatible JPEGTABLES."); + } } TAG* write_sprite_defines(TAG*tag, SWF*sprite) { - int pos = 0; TAG*rtag = sprite->firstTag; - while(rtag) { + while(rtag && rtag->id!=ST_END) { if(!swf_isAllowedSpriteTag(rtag)) { logf(" processing sprite tag %02x", tag->id); if(swf_isDefiningTag(rtag)) @@ -405,7 +443,7 @@ TAG* write_sprite_defines(TAG*tag, SWF*sprite) } } } - pos++; + rtag = rtag->next; } return tag; } @@ -451,11 +489,12 @@ void write_changepos(TAG*output, TAG*tag) if(flags&2) { swf_SetU16(output, swf_GetU16(tag)); //id } - if(flags&4) { - swf_GetMatrix(tag, &m); - matrix_adjust(&m); - swf_SetMatrix(tag, &m); - } + // flags & 4 + swf_GetMatrix(tag, &m); + matrix_adjust(&m); + swf_SetMatrix(output, &m); + + //swf_ResetReadBits(tag); swf_SetBlock(output, &tag->data[tag->pos], tag->len - tag->pos); break; } @@ -463,9 +502,12 @@ void write_changepos(TAG*output, TAG*tag) MATRIX m; swf_SetU16(output, swf_GetU16(tag)); //id swf_SetU16(output, swf_GetU16(tag)); //depth + swf_GetMatrix(tag, &m); matrix_adjust(&m); - swf_SetMatrix(tag, &m); + swf_SetMatrix(output, &m); + + //swf_ResetReadBits(tag); swf_SetBlock(output, &tag->data[tag->pos], tag->len - tag->pos); break; } @@ -481,7 +523,6 @@ void write_changepos(TAG*output, TAG*tag) TAG* write_sprite(TAG*tag, SWF*sprite, int spriteid, int replaceddefine) { - int pos = 0; TAG* definespritetag; TAG* rtag; int tmp; @@ -491,7 +532,6 @@ TAG* write_sprite(TAG*tag, SWF*sprite, int spriteid, int replaceddefine) swf_SetU16(tag, sprite->frameCount); logf (" sprite id is %d", spriteid); - // write slave(2) (body) tmp = sprite->frameCount; logf(" %d frames to go",tmp); @@ -511,16 +551,16 @@ TAG* write_sprite(TAG*tag, SWF*sprite, int spriteid, int replaceddefine) } rtag = sprite->firstTag; - while(rtag) + while(rtag && rtag->id!=ST_END) { 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, +1); if(tag->id == ST_SHOWFRAME) { @@ -528,7 +568,9 @@ TAG* write_sprite(TAG*tag, SWF*sprite, int spriteid, int replaceddefine) logf(" %d frames to go",tmp); } } + rtag = rtag->next; } + tag = swf_InsertTag(tag, ST_END); return tag; } @@ -549,11 +591,11 @@ TAG* write_master(TAG*tag, SWF*master, SWF*slave, int spriteid, int replaceddefi TAG* rtag = master->firstTag; TAG* stag = slave->firstTag; - while(rtag) + while(rtag && rtag->id!=ST_END) { if(rtag->id == ST_SHOWFRAME && outputslave) { - while(stag) { + while(stag && stag->id!=ST_END) { if(stag->id == ST_SHOWFRAME) { stag = stag->next; sframe++; @@ -579,9 +621,9 @@ TAG* write_master(TAG*tag, SWF*master, SWF*slave, int spriteid, int replaceddefi { if(config.overlay) { - PUT16(rtag->data, replaceddefine); tag = swf_InsertTag(tag, rtag->id); swf_SetBlock(tag, rtag->data, rtag->len); + swf_SetDefineID(tag, replaceddefine); } else { /* don't write this tag */ logf(" replacing tag %d id %d with sprite", rtag->id @@ -653,11 +695,11 @@ 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) - while(stag) + while(stag && stag->id!=ST_END) { if(tag_ok_for_slave(stag->id)) { tag = swf_InsertTag(tag, stag->id); @@ -674,18 +716,100 @@ 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 catcombine(SWF*master, char*slave_name, SWF*slave, SWF*newswf) { - printf("--cat not implemented yet. Please use the swfcombine from swftools 0.3.1 or 0.2.3.\n"); - exit(1); + char* depths; + int t; + TAG*tag; + TAG*mtag,*stag; + if(config.isframe) { + logf(" Can't combine --cat and --frame"); + exit(1); + } + + tag = master->firstTag; + while(tag) + { + if(swf_isDefiningTag(tag)) { + int defineid = swf_GetDefineID(tag); + 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); + + depths = malloc(65536); + if(!depths) { + logf(" Couldn't allocate %d bytes of memory", 65536); + return; + } + memset(depths, 0, 65536); + mtag = master->firstTag; + while(mtag && mtag->id!=ST_END) + { + int num=1; + U16 depth; + logf(" [master] write tag %02x (%d bytes in body)", + mtag->id, mtag->len); + switch(mtag->id) { + case ST_PLACEOBJECT2: + num++; + case ST_PLACEOBJECT: { + depth = swf_GetDepth(mtag); + depths[depth] = 1; + } + break; + case ST_REMOVEOBJECT: { + depth = swf_GetDepth(mtag); + depths[depth] = 0; + } + break; + case ST_REMOVEOBJECT2: { + depth = swf_GetDepth(mtag); + depths[depth] = 0; + } + break; + } + tag = swf_InsertTag(tag, mtag->id); + swf_SetBlock(tag, mtag->data, mtag->len); + + mtag = mtag->next; + } + + for(t=0;t<65536;t++) + if(depths[t]) + { + char data[16]; + int len; + tag = swf_InsertTag(tag, ST_REMOVEOBJECT2); + swf_SetU16(tag, t); + } + free(depths); + + stag = slave->firstTag; + while(stag && stag->id!=ST_END) + { + logf(" [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); + stag = stag->next; + } + tag = swf_InsertTag(tag, ST_END); } void normalcombine(SWF*master, char*slave_name, SWF*slave, SWF*newswf) { - int pos=0; int spriteid = -1; int replaceddefine = -1; int frame = 0; @@ -693,22 +817,20 @@ void normalcombine(SWF*master, char*slave_name, SWF*slave, SWF*newswf) TAG * tag = master->firstTag; // set the idtab - pos = 0; - while(tag) { 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)) { @@ -729,6 +851,7 @@ void normalcombine(SWF*master, char*slave_name, SWF*slave, SWF*newswf) logf(" Slave file attached to frame %d (%s).", frame, name); } } + tag = tag->next; }; if (spriteid<0 && !config.isframe) { @@ -742,7 +865,7 @@ void normalcombine(SWF*master, char*slave_name, SWF*slave, SWF*newswf) } swf_Relocate (slave, masterbitmap); - jpeg_assert(); + jpeg_assert(slave, master); if (config.overlay) replaceddefine = get_free_id(masterbitmap); @@ -968,11 +1091,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; }