git.asbjorn.biz
/
swftools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Generated from configure.in
[swftools.git]
/
src
/
swfcombine.c
diff --git
a/src/swfcombine.c
b/src/swfcombine.c
index
131f2b5
..
4089f5b
100644
(file)
--- a/
src/swfcombine.c
+++ b/
src/swfcombine.c
@@
-30,15
+30,19
@@
struct config_t
char merge;
char isframe;
int loglevel;
char merge;
char isframe;
int loglevel;
- int movex;
- int movey;
int sizex;
char hassizex;
int sizey;
char hassizey;
int framerate;
int sizex;
char hassizex;
int sizey;
char hassizey;
int framerate;
+ int movex;
+ int movey;
float scalex;
float scaley;
float scalex;
float scaley;
+ int mastermovex;
+ int mastermovey;
+ float masterscalex;
+ float masterscaley;
};
struct config_t config;
};
struct config_t config;
@@
-209,6
+213,12
@@
int args_callback_command(char*name, char*val) {
if(!master_filename) {
master_filename = filename;
master_name = myname;
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("<verbose> slave entity %s (named \"%s\")\n", filename, myname);
} else {
logf("<verbose> slave entity %s (named \"%s\")\n", filename, myname);
@@
-234,7
+244,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("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");
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
+269,18
@@
static void makestackmaster(SWF*swf)
int t;
SRECT box;
int fileversion = 1;
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 */
memset(&box, 0, sizeof(box));
/* scan all slaves for bounding box */
- for(t=0;t<numslaves;t++)
+ for(t=numslaves-1;t>=0;t--)
{
SWF head;
int ret;
int fi=open(slave_filename[t],O_RDONLY);
{
SWF head;
int ret;
int fi=open(slave_filename[t],O_RDONLY);
+ TAG*tag;
if(fi<0 || swf_ReadSWF(fi, &head)<0) {
logf("<fatal> Couldn't open/read %s.", slave_filename[t]);
exit(1);
if(fi<0 || swf_ReadSWF(fi, &head)<0) {
logf("<fatal> Couldn't open/read %s.", slave_filename[t]);
exit(1);
@@
-276,6
+290,17
@@
static void makestackmaster(SWF*swf)
slave_filename[t],
head.movieSize.xmin, head.movieSize.ymin,
head.movieSize.xmax, head.movieSize.ymax);
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)
if(head.fileVersion > fileversion)
fileversion = head.fileVersion;
if(!t)
@@
-297,12
+322,13
@@
static void makestackmaster(SWF*swf)
}
memset(swf, 0, sizeof(SWF));
}
memset(swf, 0, sizeof(SWF));
+ swf->fileVersion = fileversion;
+ swf->movieSize = box;
+ swf->frameRate = frameRate;
swf->firstTag = swf_InsertTag(0, ST_SETBACKGROUNDCOLOR);
tag = swf->firstTag;
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<numslaves;t++)
{
for(t=0;t<numslaves;t++)
{
@@
-461,19
+487,19
@@
void changedepth(TAG*tag, int add)
PUT16(&tag->data[0],GET16(&tag->data[0])+add);
}
PUT16(&tag->data[0],GET16(&tag->data[0])+add);
}
-void matrix_adjust(MATRIX*m)
+void matrix_adjust(MATRIX*m, int movex, int movey, float scalex, float scaley)
{
{
- 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->r0 = (int)(m->r0*scalex);
+ m->r1 = (int)(m->r1*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)
{
{
- if(config.movex || config.movey || config.scalex != 1 || config.scaley != 1)
+ if(movex || movey || scalex != 1 || scaley != 1)
{
switch(tag->id)
{
{
switch(tag->id)
{
@@
-481,6
+507,8
@@
void write_changepos(TAG*output, TAG*tag)
MATRIX m;
U8 flags;
swf_GetMatrix(0, &m);
MATRIX m;
U8 flags;
swf_GetMatrix(0, &m);
+ tag->pos = 0;
+ tag->readBit = 0;
flags = swf_GetU8(tag);
swf_SetU8(output, flags|4);
flags = swf_GetU8(tag);
swf_SetU8(output, flags|4);
@@
-490,8
+518,12
@@
void write_changepos(TAG*output, TAG*tag)
swf_SetU16(output, swf_GetU16(tag)); //id
}
// flags & 4
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);
swf_SetMatrix(output, &m);
//swf_ResetReadBits(tag);
swf_SetMatrix(output, &m);
//swf_ResetReadBits(tag);
@@
-504,7
+536,7
@@
void write_changepos(TAG*output, TAG*tag)
swf_SetU16(output, swf_GetU16(tag)); //depth
swf_GetMatrix(tag, &m);
swf_SetU16(output, swf_GetU16(tag)); //depth
swf_GetMatrix(tag, &m);
- matrix_adjust(&m);
+ matrix_adjust(&m, movex, movey, scalex, scaley);
swf_SetMatrix(output, &m);
//swf_ResetReadBits(tag);
swf_SetMatrix(output, &m);
//swf_ResetReadBits(tag);
@@
-546,7
+578,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
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
}
swf_SetU16(tag, replaceddefine); //id
}
@@
-558,9
+590,9
@@
TAG* write_sprite(TAG*tag, SWF*sprite, int spriteid, int replaceddefine)
logf("<debug> [sprite main] write tag %02x (%d bytes in body)",
rtag->id, rtag->len);
tag = swf_InsertTag(tag, rtag->id);
logf("<debug> [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);
+
+ changedepth(tag, +2);
if(tag->id == ST_SHOWFRAME)
{
if(tag->id == ST_SHOWFRAME)
{
@@
-678,7
+710,6
@@
TAG* write_master(TAG*tag, SWF*master, SWF*slave, int spriteid, int replaceddefi
if(frame == slaveframe && !config.overlay)
dontwrite = 1;
case ST_REMOVEOBJECT:
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
/* place/removetags for the object we replaced
should be discarded, too, as the object to insert
isn't a sprite
@@
-687,12
+718,14
@@
TAG* write_master(TAG*tag, SWF*master, SWF*slave, int spriteid, int replaceddefi
!config.isframe && config.merge)
dontwrite = 1;
break;
!config.isframe && config.merge)
dontwrite = 1;
break;
+ case ST_REMOVEOBJECT2:
+ break;
}
if(!dontwrite) {
logf("<debug> [master] write tag %02x (%d bytes in body)",
rtag->id, rtag->len);
tag = swf_InsertTag(tag, rtag->id);
}
if(!dontwrite) {
logf("<debug> [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);
}
}
rtag = rtag->next;
}
}
rtag = rtag->next;
@@
-720,6
+753,20
@@
TAG* write_master(TAG*tag, SWF*master, SWF*slave, int spriteid, int replaceddefi
return tag;
}
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;
void catcombine(SWF*master, char*slave_name, SWF*slave, SWF*newswf)
{
char* depths;
@@
-746,6
+793,8
@@
void catcombine(SWF*master, char*slave_name, SWF*slave, SWF*newswf)
jpeg_assert(master, slave);
memcpy(newswf, master, sizeof(SWF));
jpeg_assert(master, slave);
memcpy(newswf, master, sizeof(SWF));
+ adjustheader(newswf);
+
tag = newswf->firstTag = swf_InsertTag(0, ST_REFLEX); // to be removed later
depths = malloc(65536);
tag = newswf->firstTag = swf_InsertTag(0, ST_REFLEX); // to be removed later
depths = malloc(65536);
@@
-827,6
+876,12
@@
void normalcombine(SWF*master, char*slave_name, SWF*slave, SWF*newswf)
int defineid = swf_GetDefineID(tag);
logf("<debug> tagid %02x defines object %d", tag->id, defineid);
masterbitmap[defineid] = 1;
int defineid = swf_GetDefineID(tag);
logf("<debug> tagid %02x defines object %d", tag->id, defineid);
masterbitmap[defineid] = 1;
+ if (!slavename && defineid==slaveid) {
+ if(defineid>=0) {
+ spriteid = defineid;
+ logf("<notice> Slave file attached to object %d.", defineid);
+ }
+ }
} else if(tag->id == ST_PLACEOBJECT2) {
char * name = swf_GetName(tag);
int id = swf_GetPlaceID(tag);
} else if(tag->id == ST_PLACEOBJECT2) {
char * name = swf_GetName(tag);
int id = swf_GetPlaceID(tag);
@@
-836,11
+891,10
@@
void normalcombine(SWF*master, char*slave_name, SWF*slave, SWF*newswf)
else
logf("<verbose> tagid %02x places object %d (no name)", tag->id, id);
else
logf("<verbose> 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;
if(id>=0) {
spriteid = id;
- logf("<notice> Slave file attached to object %d.", id);
+ logf("<notice> Slave file attached to named object %s (%d).", name, id);
}
}
} else if(tag->id == ST_SHOWFRAME) {
}
}
} else if(tag->id == ST_SHOWFRAME) {
@@
-877,6
+931,8
@@
void normalcombine(SWF*master, char*slave_name, SWF*slave, SWF*newswf)
// write file
memcpy(newswf, master, sizeof(SWF));
// write file
memcpy(newswf, master, sizeof(SWF));
+ adjustheader(newswf);
+
newswf->firstTag = tag = swf_InsertTag(0, ST_REFLEX); // to be removed later
if (config.antistream) {
newswf->firstTag = tag = swf_InsertTag(0, ST_REFLEX); // to be removed later
if (config.antistream) {
@@
-890,10
+946,10
@@
void normalcombine(SWF*master, char*slave_name, SWF*slave, SWF*newswf)
} else {
if (config.merge)
tag = write_master(tag, master, slave, spriteid, replaceddefine,
} 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,
else
tag = write_master(tag, master, slave, spriteid, replaceddefine,
- FLAGS_WRITEDEFINES|FLAGS_WRITENONDEFINES|FLAGS_WRITESPRITE);
+ FLAGS_WRITEDEFINES|FLAGS_WRITENONDEFINES| FLAGS_WRITESPRITE );
}
tag = newswf->firstTag;
}
tag = newswf->firstTag;
@@
-935,7
+991,7
@@
void combine(SWF*master, char*slave_name, SWF*slave, SWF*newswf)
slaveid = -1;
} else {
/* if id wasn't given as either #number or number,
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 */
}
}
needed to supply the -f option in this case */
}
}
@@
-944,6
+1000,10
@@
void combine(SWF*master, char*slave_name, SWF*slave, SWF*newswf)
logf("<debug> move y (%d)", config.movey);
logf("<debug> scale x (%f)", config.scalex);
logf("<debug> scale y (%f)", config.scaley);
logf("<debug> move y (%d)", config.movey);
logf("<debug> scale x (%f)", config.scalex);
logf("<debug> scale y (%f)", config.scaley);
+ logf("<debug> master move x (%d)", config.mastermovex);
+ logf("<debug> master move y (%d)", config.mastermovey);
+ logf("<debug> master scale x (%f)", config.masterscalex);
+ logf("<debug> master scale y (%f)", config.masterscaley);
logf("<debug> is frame (%d)", config.isframe);
memset(masterbitmap, 0, sizeof(masterbitmap));
logf("<debug> is frame (%d)", config.isframe);
memset(masterbitmap, 0, sizeof(masterbitmap));
@@
-975,6
+1035,10
@@
int main(int argn, char *argv[])
config.scaley = 1.0;
config.sizex = 0;
config.sizey = 0;
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;
config.hassizex = 0;
config.hassizey = 0;
config.framerate = 0;