git.asbjorn.biz
/
swftools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
moved from mkvideo.c
[swftools.git]
/
src
/
swfcombine.c
diff --git
a/src/swfcombine.c
b/src/swfcombine.c
index
9dedbf8
..
e76b5c6
100644
(file)
--- a/
src/swfcombine.c
+++ b/
src/swfcombine.c
@@
-10,7
+10,6
@@
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
-#include <zlib.h>
#include "../lib/rfxswf.h"
#include "../lib/args.h"
#include "../lib/log.h"
#include "../lib/rfxswf.h"
#include "../lib/args.h"
#include "../lib/log.h"
@@
-30,15
+29,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
+212,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);
@@
-269,7
+278,7
@@
static void makestackmaster(SWF*swf)
{
SWF head;
int ret;
{
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("<fatal> Couldn't open/read %s.", slave_filename[t]);
TAG*tag;
if(fi<0 || swf_ReadSWF(fi, &head)<0) {
logf("<fatal> Couldn't open/read %s.", slave_filename[t]);
@@
-477,19
+486,23
@@
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, 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 || scaley != 1)
{
switch(tag->id)
{
{
switch(tag->id)
{
@@
-497,6
+510,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);
@@
-511,7
+526,7
@@
void write_changepos(TAG*output, TAG*tag)
} else {
swf_GetMatrix(0, &m);
}
} else {
swf_GetMatrix(0, &m);
}
- matrix_adjust(&m);
+ matrix_adjust(&m, movex, movey, scalex, scaley, scalepos);
swf_SetMatrix(output, &m);
//swf_ResetReadBits(tag);
swf_SetMatrix(output, &m);
//swf_ResetReadBits(tag);
@@
-524,7
+539,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, scalepos);
swf_SetMatrix(output, &m);
//swf_ResetReadBits(tag);
swf_SetMatrix(output, &m);
//swf_ResetReadBits(tag);
@@
-578,7
+593,7
@@
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);
+ write_changepos(tag, rtag, config.movex, config.movey, config.scalex, config.scaley, 0);
changedepth(tag, +2);
changedepth(tag, +2);
@@
-698,7
+713,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
@@
-707,12
+721,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, 1);
}
}
rtag = rtag->next;
}
}
rtag = rtag->next;
@@
-863,6
+879,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);
@@
-872,11
+894,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) {
@@
-928,10
+949,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;
@@
-973,7
+994,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 */
}
}
@@
-982,6
+1003,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));
@@
-1013,6
+1038,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;
@@
-1045,7
+1074,7
@@
int main(int argn, char *argv[])
else {
int ret;
logf("<verbose> master entity %s (named \"%s\")\n", master_filename, master_name);
else {
int ret;
logf("<verbose> master entity %s (named \"%s\")\n", master_filename, master_name);
- fi = open(master_filename, O_RDONLY);
+ fi = open(master_filename, O_RDONLY|O_BINARY);
if(fi<0) {
logf("<fatal> Failed to open %s\n", master_filename);
exit(1);
if(fi<0) {
logf("<fatal> Failed to open %s\n", master_filename);
exit(1);
@@
-1110,7
+1139,7
@@
int main(int argn, char *argv[])
if(!config.dummy)
{
int ret;
if(!config.dummy)
{
int ret;
- fi = open(slave_filename[t], O_RDONLY);
+ fi = open(slave_filename[t], O_RDONLY|O_BINARY);
if(!fi) {
logf("<fatal> Failed to open %s\n", slave_filename[t]);
exit(1);
if(!fi) {
logf("<fatal> Failed to open %s\n", slave_filename[t]);
exit(1);
@@
-1137,7
+1166,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);
if(config.zlib)
swf_WriteSWC(fi, &newswf);