char cat;
char merge;
char isframe;
+ char local_with_networking;
+ char local_with_filesystem;
+ char accelerated_blit;
+ char hardware_gpu;
int loglevel;
int sizex;
char hassizex;
int sizey;
char hassizey;
+ int flashversion;
int framerate;
int movex;
int movey;
{
float rate = atof(val);
- if ((rate < 1.0/256) ||(rate >= 256.0)) {
+ if ((rate < 0) ||(rate >= 256.0)) {
fprintf(stderr, "Error: You must specify a valid framerate between 1/256 and 255.\n");
exit(1);
}
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) {
{"l", "overlay"},
{"c", "clip"},
{"v", "verbose"},
+{"F", "flashversion"},
{"d", "dummy"},
{"f", "frame"},
{"x", "movex"},
{"r", "rate"},
{"X", "width"},
{"Y", "height"},
+{"N", "local-with-networking"},
+{"G", "hardware-gpu"},
+{"B", "accelerated-blit"},
+{"L", "local-with-filesystem"},
{"z", "zlib"},
{0,0}
};
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 <xpos> x Adjust position of slave by <xpos> pixels\n");
printf("-y , --movey <ypos> y Adjust position of slave by <ypos> pixels\n");
- printf("-s , --scale <scale> Adjust size of slave by <scale> percent (e.g. 100% = original size)\n");
+ printf("-s , --scale <scale> Adjust size of slave by <scale> percent (e.g. 100%% = original size)\n");
printf("-r , --rate <fps> Set movie framerate to <fps> (frames/sec)\n");
printf("-X , --width <width> Force movie bbox width to <width> (default: use master width (not with -t))\n");
printf("-Y , --height <height> Force movie bbox height to <height> (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 <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)
{
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));
exit(1);
}
close(fi);
+ swf_RemoveJPEGTables(&head);
+ fileAttributes |= head.fileAttributes;
+ removeCommonTags(&head);
+
msg("<verbose> File %s has bounding box %d:%d:%d:%d\n",
slave_filename[t],
head.movieSize.xmin, head.movieSize.ymin,
swf->fileVersion = fileversion;
swf->movieSize = box;
swf->frameRate = frameRate;
+ swf->fileAttributes = fileAttributes;
swf->firstTag = swf_InsertTag(0, ST_SETBACKGROUNDCOLOR);
tag = swf->firstTag;
{
// 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;
}
}
case ST_SETBACKGROUNDCOLOR:
msg("<debug> deliberately ignoring BACKGROUNDCOLOR tag");
break;
+ case ST_SHOWFRAME:
+ msg("<debug> deliberately ignoring SHOWFRAME tag");
+ break;
+ case ST_REFLEX:
+ msg("<debug> deliberately ignoring REFLEX tag");
+ break;
case 40:
case 49:
case 51:
- msg("<notice> found tag %d. This is a Generator template, isn't it?", tag->id);
+ msg("<notice> found tag %d. This is a Generator template, isn't it?", rtag->id);
break;
default:
- msg("<notice> funny tag: %d is neither defining nor sprite", tag->id);
+ msg("<notice> funny tag: %d is neither defining nor sprite", rtag->id);
}
}
}
PUT16(&tag->data[0],GET16(&tag->data[0])+add);
if(tag->id == ST_PLACEOBJECT2) {
SWFPLACEOBJECT obj;
- swf_SetTagPos(tag, 0);
U8 flags;
+ swf_SetTagPos(tag, 0);
flags = swf_GetU8(tag);
if(flags&2) swf_GetU16(tag); //id
if(flags&4) swf_GetMatrix(tag, 0);
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;
}
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;
}
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))
swf_SetDefineID(tag, replaceddefine);
} else {
/* don't write this tag */
- msg("<verbose> replacing tag %d id %d with sprite", rtag->id
- ,spriteid);
+ msg("<verbose> replacing tag %d ID %d with sprite", rtag->id ,spriteid);
}
if(flags&FLAGS_WRITESPRITE)
{
+ msg("<debug> writing sprite defines");
tag = write_sprite_defines(tag, slave);
+ msg("<debug> writing sprite");
tag = write_sprite(tag, slave, spriteid, replaceddefine);
}
if(flags&FLAGS_WRITESLAVE)
{
+ msg("<debug> writing slave");
outputslave = 1;
}
} else {
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;
if((flags&FLAGS_WRITESPRITE) && !slavewritten)
{
int id = get_free_id(masterbitmap);
- int depth = 0;
+ int depth = 65535;
+ deletedepth = 65535;
if(config.clip) {
msg("<fatal> Can't combine --clip and --frame");
}
rtag->id, rtag->len);
tag = swf_InsertTag(tag, rtag->id);
write_changepos(tag, rtag, config.mastermovex, config.mastermovey, config.masterscalex, config.masterscaley, 1);
+
}
}
rtag = rtag->next;
while(stag && stag->id!=ST_END)
{
if(tag_ok_for_slave(stag->id)) {
+ msg("<debug> [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;
}
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)
msg("<fatal> Can't combine --cat and --frame");
exit(1);
}
+ if(config.flashversion)
+ master->fileVersion = config.flashversion;
tag = master->firstTag;
while(tag)
}
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)
msg("<notice> Slave file attached to object %d.", defineid);
}
}
+ } else if(tag->id == ST_EXPORTASSETS) {
+ int t;
+ int num = swf_GetU16(tag);
+ for(t=0;t<num;t++)
+ {
+ U16 id = swf_GetU16(tag);
+ char*name = swf_GetString(tag);
+ if(spriteid<0 && slavename && !strcmp(name,slavename)) {
+ spriteid = id;
+ msg("<notice> 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;t<num;t++) {
+ U16 id = swf_GetU16(tag);
+ if(!id) {
+ masterbitmap[id] = 1;
+ }
+ swf_GetString(tag);
+ }
} else if(tag->id == 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)
msg("<verbose> tagid %02x places object %d named \"%s\"", tag->id, id, name);
else
if (spriteid<0 && !config.isframe) {
if(slavename) {
- if(strcmp(slavename,"!!dummy!!"))
+ if(strcmp(slavename,"!!dummy!!")) {
msg("<warning> Didn't find anything named %s in file. No substitutions will occur.", slavename);
+ if(!strcmp(slavename, "swf")) {
+ msg("<warning> (If you were trying to combine rfxview with a document, try replacing 'swf' with 'viewport'.");
+ }
+ }
}
else
msg("<warning> Didn't find id %d in file. No substitutions will occur.", slaveid);
}
swf_Relocate (slave, masterbitmap);
+
if(config.merge)
swf_RelocateDepth (slave, depthbitmap);
jpeg_assert(slave, master);
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)
slaveid = -1;
slaveframe = -1;
+ if(!master->fileVersion && slave)
+ master->fileVersion = slave->fileVersion;
+
+ master->fileAttributes |= slave->fileAttributes;
+
swf_FoldAll(master);
swf_FoldAll(slave);
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) {
msg("<error> Can't combine --cat and --merge");
exit(1);
}
+
+ if(config.stack && config.cat) {
+ msg("<error> Can't combine --cat and --stack");
+ exit(1);
+ }
if(config.stack) {
if(config.overlay) {
msg("<fatal> Failed to read from %s\n", master_filename);
exit(1);
}
+ swf_RemoveJPEGTables(&master);
+ removeCommonTags(&master);
msg("<debug> Read %d bytes from masterfile\n", ret);
close(fi);
}
}
msg("<debug> 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;
+ }
}
+ if(!newswf.fileVersion)
+ newswf.fileVersion = 4;
+
+ 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)
- swf_WriteSWC(fi, &newswf);
- else {
- newswf.compressed = 0;
+ 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
}
git.asbjorn.biz / swftools.git / blobdiff