X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fswfextract.c;h=312d9da53e0e89f4ac5e3b3aa257d06452c9653f;hb=84ed8b7b39dc177b4060e1a341e1d8c6a727801b;hp=aca4d970bc62f95fad7e630c33b8faf4999affc2;hpb=addd269469480d86c20849c4fcdb504c2f7ab233;p=swftools.git diff --git a/src/swfextract.c b/src/swfextract.c index aca4d97..312d9da 100644 --- a/src/swfextract.c +++ b/src/swfextract.c @@ -48,6 +48,7 @@ char* extractname = 0; char hollow = 0; char originalplaceobjects = 0; +char movetozero = 0; int numextracts = 0; @@ -60,6 +61,7 @@ struct options_t options[] = {"j","jpegs"}, {"p","pngs"}, {"P","placeobject"}, + {"0","movetozero"}, {"m","mp3"}, {"s","sound"}, {"n","name"}, @@ -154,6 +156,10 @@ int args_callback_option(char*name,char*val) originalplaceobjects = 1; return 0; } + else if(!strcmp(name, "0")) { + movetozero = 1; + return 0; + } else if(!strcmp(name, "w")) { hollow = 1; return 0; @@ -254,6 +260,18 @@ void enumerateIDs(TAG*tag, void(*callback)(void*)) callback(&tag->data[ptr[t]]); } +void moveToZero(TAG*tag) +{ + if(!swf_isPlaceTag(tag)) + return; + SWFPLACEOBJECT obj; + swf_GetPlaceObject(tag, &obj); + obj.matrix.tx = 0; + obj.matrix.ty = 0; + swf_ResetTag(tag, tag->id); + swf_SetPlaceObject(tag, &obj); +} + void extractTag(SWF*swf, char*filename) { SWF newswf; @@ -271,6 +289,12 @@ void extractTag(SWF*swf, char*filename) newswf.fileVersion = swf->fileVersion; newswf.frameRate = swf->frameRate; newswf.movieSize = swf->movieSize; + if(movetozero && originalplaceobjects) { + newswf.movieSize.xmax = swf->movieSize.xmax - swf->movieSize.xmin; + newswf.movieSize.ymax = swf->movieSize.ymax - swf->movieSize.ymin; + newswf.movieSize.xmin = 0; + newswf.movieSize.ymin = 0; + } newswf.firstTag = swf_InsertTag(NULL,ST_SETBACKGROUNDCOLOR); desttag = newswf.firstTag; @@ -316,6 +340,8 @@ void extractTag(SWF*swf, char*filename) } if(srctag->id == ST_DEFINESPRITE) sprite = 1; + if(srctag->id == ST_JPEGTABLES) + copy = 1; if(swf_isDefiningTag(srctag)) { int id = swf_GetDefineID(srctag); if(used[id]) { @@ -325,7 +351,7 @@ void extractTag(SWF*swf, char*filename) swf_ExpandRect2(&objectbbox, &b); } } else - if (((((srctag->id == ST_PLACEOBJECT || srctag->id == ST_PLACEOBJECT2) && originalplaceobjects) + if ((((swf_isPlaceTag(srctag) && originalplaceobjects) || srctag->id == ST_STARTSOUND) && (used[swf_GetPlaceID(srctag)]&4) ) || (swf_isPseudoDefiningTag(srctag) && used[swf_GetDefineID(srctag)]) || (tagused[tagnum])) @@ -345,6 +371,9 @@ void extractTag(SWF*swf, char*filename) desttag->len = desttag->memsize = srctag->len; desttag->data = malloc(srctag->len); memcpy(desttag->data, srctag->data, srctag->len); + if(movetozero && swf_isPlaceTag(desttag)) { + moveToZero(desttag); + } if(reset) copy = 0; } @@ -354,21 +383,67 @@ void extractTag(SWF*swf, char*filename) } if(!extractframes && !hollow) { if(!originalplaceobjects && (extractids||extractname_id>=0)) { + int number = 0; + int id = 0; int t; - int s=0; - if((objectbbox.xmin|objectbbox.ymin|objectbbox.xmax|objectbbox.ymax)!=0) - newswf.movieSize = objectbbox; + TAG* objtag = 0; + SRECT bbox; + memset(&bbox, 0, sizeof(SRECT)); + if(extractids) { + for(t=0;t<65536;t++) { + if(is_in_range(t, extractids)) { + id = t; + number++; + } + } + } + if(number>=2) { + printf("warning! You should use the -P when extracting multiple objects\n"); + } + + if(number == 1) { + /* if there is only one object, we will scale it. + So let's figure out its bounding box */ + TAG*tag = swf->firstTag; + while(tag) { + if(swf_isDefiningTag(tag) && tag->id != ST_DEFINESPRITE) { + if(swf_GetDefineID(tag) == id) + bbox = swf_GetDefineBBox(tag); + objtag = tag; + } + tag = tag->next; + } + newswf.movieSize.xmin = 0; + newswf.movieSize.ymin = 0; + newswf.movieSize.xmax = 512*20; + newswf.movieSize.ymax = 512*20; + } else { + if((objectbbox.xmin|objectbbox.ymin|objectbbox.xmax|objectbbox.ymax)!=0) + newswf.movieSize = objectbbox; + } + if(extractname_id>=0) { desttag = swf_InsertTag(desttag, ST_PLACEOBJECT2); swf_ObjectPlace(desttag, extractname_id, extractname_id, 0,0,extractname); } else { for(t=0;t<65536;t++) { if(is_in_range(t, extractids)) { + MATRIX m; desttag = swf_InsertTag(desttag, ST_PLACEOBJECT2); - swf_ObjectPlace(desttag, t, t, 0,0,0); - s++; - if(s==2) - printf("warning! You should use the -P when extracting multiple objects\n"); + swf_GetMatrix(0, &m); + if(objtag) { + int width = bbox.xmax - bbox.xmin; + int height = bbox.ymax - bbox.ymin; + int max = width>height?width:height; + m.tx = -bbox.xmin; + m.ty = -bbox.ymin; + if(max) { + m.sx = (512*20*65536)/max; + m.sy = (512*20*65536)/max; + } + //newswf.movieSize = swf_TurnRect(newswf.movieSize, &m); + } + swf_ObjectPlace(desttag, t, t, &m,0,0); } } } @@ -420,6 +495,8 @@ void listObjects(SWF*swf) int t; int frame = 0; char*names[] = {"Shape", "MovieClip", "JPEG", "PNG", "Sound", "Font"}; + char*options[] = {"-i", "-i", "-j", "-p", "-s", "-F"}; + int mp3=0; printf("Objects in file %s:\n",filename); swf_FoldAll(swf); for(t=0;tfirstTag; first = 1; while(tag) { + if(tag->id == ST_SOUNDSTREAMHEAD || tag->id == ST_SOUNDSTREAMHEAD2) + mp3 = 1; if(isOfType(t,tag)) nr++; tag = tag->next; @@ -436,7 +515,7 @@ void listObjects(SWF*swf) if(!nr) continue; - printf(" %d %s%s: ID(s) ", nr, names[t], nr>1?"s":""); + printf(" [%s] %d %s%s: ID(s) ", options[t], nr, names[t], nr>1?"s":""); tag = swf->firstTag; while(tag) { @@ -479,9 +558,12 @@ void listObjects(SWF*swf) } if(frame) - printf(" %d Frames: ID(s) 0-%d\n", frame, frame); + printf(" [-f] %d Frames: ID(s) 0-%d\n", frame, frame); else - printf(" 1 Frame: ID(s) 0\n"); + printf(" [-f] 1 Frame: ID(s) 0\n"); + + if(mp3) + printf(" [-m] 1 MP3 Soundstream\n"); } void handlefont(SWF*swf, TAG*tag) @@ -674,11 +756,11 @@ void handlelossless(TAG*tag) U8 bpp = 1; U8 format; U8 tmp; - U8* data=0; + Bytef* data=0; U8* data2=0; U8* data3=0; - U32 datalen; - U32 datalen2; + uLongf datalen; + uLongf datalen2; U32 datalen3; U8 head[] = {137,80,78,71,13,10,26,10}; int cols; @@ -786,12 +868,21 @@ void handlelossless(TAG*tag) png_write_byte(fi,palette[t].b); } png_end_chunk(fi); + + if(alpha) { + /* write alpha palette */ + png_start_chunk(fi, "tRNS", 256); + for(t=0;t<256;t++) { + png_write_byte(fi,palette[t].a); + } + png_end_chunk(fi); + } } { int pos2 = 0; int x,y; int srcwidth = width * (bpp/8); - datalen3 = width*height*4; + datalen3 = (width*4+5)*height; data3 = (U8*)malloc(datalen3); for(y=0;ydata[1]; mainb = tag->data[2]; } - else if(tag->id == ST_PLACEOBJECT2) { + else if(swf_isPlaceTag(tag) && tag->id != ST_PLACEOBJECT ) { char*name = swf_GetName(tag); if(name && extractname && !strcmp(name, extractname)) { int id = swf_GetPlaceID(tag); used[id] = 5; found = 1; - tagused[tagnum] = 1; + if(originalplaceobjects) { + tagused[tagnum] = 1; + } depths[swf_GetDepth(tag)] = 1; extractname_id = id; }