X-Git-Url: http://git.asbjorn.biz/?p=swftools.git;a=blobdiff_plain;f=src%2Fswfextract.c;h=e385f1f1accd12941ffdc4ae53111c1580677e4a;hp=aca4d970bc62f95fad7e630c33b8faf4999affc2;hb=2391d7ae5d8a145a250a8b80ab8c93ba74eba030;hpb=addd269469480d86c20849c4fcdb504c2f7ab233

diff --git a/src/swfextract.c b/src/swfextract.c
index aca4d97..e385f1f 100644
--- a/src/swfextract.c
+++ b/src/swfextract.c
@@ -42,12 +42,14 @@ char* extractjpegids = 0;
 char* extractfontids = 0;
 char* extractpngids = 0;
 char* extractsoundids = 0;
+char* extractbinaryids = 0;
 char extractmp3 = 0;
 
 char* extractname = 0;
 
 char hollow = 0;
 char originalplaceobjects = 0;
+char movetozero = 0;
 
 int numextracts = 0;
 
@@ -60,12 +62,14 @@ struct options_t options[] =
  {"j","jpegs"},
  {"p","pngs"},
  {"P","placeobject"},
+ {"0","movetozero"},
  {"m","mp3"},
  {"s","sound"},
  {"n","name"},
  {"f","frame"},
  {"F","font"},
  {"V","version"},
+ {"b","binary"},
  {0,0}
 };
 
@@ -112,6 +116,7 @@ int args_callback_option(char*name,char*val)
 	    fprintf(stderr, "Only one --jpegs argument is allowed. (Try to use a range, e.g. -j 1,2,3)\n");
 	    exit(1);
 	}
+	/* TODO: count number of IDs in val range */
 	numextracts++;
 	extractjpegids = val;
 	return 1;
@@ -134,6 +139,15 @@ int args_callback_option(char*name,char*val)
 	extractsoundids = val;
 	return 1;
     } 
+    else if(!strcmp(name, "b")) {
+	if(extractbinaryids) {
+	    fprintf(stderr, "Only one --binary argument is allowed. (Try to use a range, e.g. -s 1,2,3)\n");
+	    exit(1);
+	}
+	numextracts++;
+	extractbinaryids = val;
+	return 1;
+    } 
 #ifdef _ZLIB_INCLUDED_
     else if(!strcmp(name, "p")) {
 	if(extractpngids) {
@@ -154,6 +168,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 +272,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 +301,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 +352,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 +363,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 +383,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 +395,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);
 		    }
 		}
 	    }
@@ -407,9 +494,12 @@ int isOfType(int t, TAG*tag)
     if(t == 4 && (tag->id == ST_DEFINESOUND)) {
 	show = 1;
     }
-    if(t == 5 && (tag->id == ST_DEFINEFONT || tag->id == ST_DEFINEFONT2)) {
+    if(t == 5 && (tag->id == ST_DEFINEFONT || tag->id == ST_DEFINEFONT2 || tag->id == ST_DEFINEFONT3)) {
 	show = 1;
     }
+    if (t== 6 && (tag->id == ST_DEFINEBINARY)) {
+        show = 1;
+    }
     return show;
 }
 
@@ -419,7 +509,9 @@ void listObjects(SWF*swf)
     char first;
     int t;
     int frame = 0;
-    char*names[] = {"Shape", "MovieClip", "JPEG", "PNG", "Sound", "Font"};
+    char*names[] = {"Shape", "MovieClip", "JPEG", "PNG", "Sound", "Font", "Binary"};
+    char*options[] = {"-i", "-i", "-j", "-p", "-s", "-F","-b"};
+    int mp3=0;
     printf("Objects in file %s:\n",filename);
     swf_FoldAll(swf);
     for(t=0;t<sizeof(names)/sizeof(names[0]);t++) {
@@ -429,6 +521,8 @@ void listObjects(SWF*swf)
 	tag = swf->firstTag;
 	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 +530,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 +573,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)
@@ -503,21 +600,21 @@ void handlefont(SWF*swf, TAG*tag)
 	printf("Couldn't extract font %d\n", id);
 	return;
     }
-    if(!f->layout)
-	swf_FontCreateLayout(f);
 
     swf_WriteFont(f, filename);
     swf_FontFree(f);
 }
 
-U8*jpegtables = 0;
-int jpegtablessize;
+static char has_jpegtables=0;
+static U8*jpegtables = 0;
+static int jpegtablessize = 0;
 
 void handlejpegtables(TAG*tag)
 {
     if(tag->id == ST_JPEGTABLES) {
 	jpegtables = tag->data;
 	jpegtablessize = tag->len;
+	has_jpegtables = 1;
     }
 }
 
@@ -535,7 +632,7 @@ int findjpegboundary(U8*data, int len)
 {
     int t;
     int pos=-1;
-    for(t=0;t<len;t++) {
+    for(t=0;t<len-4;t++) {
 	if(data[t  ]==0xff &&
 	   data[t+1]==0xd9 &&
 	   data[t+2]==0xff &&
@@ -562,10 +659,14 @@ void handlejpeg(TAG*tag)
     /* swf jpeg images have two streams, which both start with ff d8 and
        end with ff d9. The following code handles sorting the middle
        <ff d9 ff d8> bytes out, so that one stream remains */
-    if(tag->id == ST_DEFINEBITSJPEG && tag->len>2 && jpegtables) {
+    if(tag->id == ST_DEFINEBITSJPEG && tag->len>2 && has_jpegtables) {
 	fi = save_fopen(filename, "wb");
-	fwrite(jpegtables, 1, jpegtablessize-2, fi); //don't write end tag (ff,d8)
-	fwrite(&tag->data[2+2], tag->len-2-2, 1, fi); //don't write start tag (ff,d9)
+	if(jpegtablessize>=2) {
+	    fwrite(jpegtables, 1, jpegtablessize-2, fi); //don't write end tag (ff,d8)
+	    fwrite(&tag->data[2+2], tag->len-2-2, 1, fi); //don't write start tag (ff,d9)
+	} else {
+	    fwrite(tag->data+2, tag->len-2, 1, fi);
+	}
 	fclose(fi);
     }
     else if(tag->id == ST_DEFINEBITSJPEG2 && tag->len>2) {
@@ -586,17 +687,21 @@ void handlejpeg(TAG*tag)
     else if(tag->id == ST_DEFINEBITSJPEG3 && tag->len>6) {
 	U32 end = GET32(&tag->data[2])+6;
 	int pos = findjpegboundary(&tag->data[6], tag->len-6);
-	if(pos<0)
-	    return;
-	pos+=6;
-	fi = save_fopen(filename, "wb");
-	fwrite(&tag->data[6], pos-6, 1, fi);
-	fwrite(&tag->data[pos+4], end-(pos+4), 1, fi);
-	fclose(fi);
+	if(pos<0) {
+            fi = save_fopen(filename, "wb");
+            fwrite(&tag->data[6], end-6, 1, fi);
+            fclose(fi);
+        } else {
+            pos+=6;
+            fi = save_fopen(filename, "wb");
+            fwrite(&tag->data[6], pos-6, 1, fi);
+            fwrite(&tag->data[pos+4], end-(pos+4), 1, fi);
+            fclose(fi);
+        }
     }
     else {
 	int id = GET16(tag->data);
-	fprintf(stderr, "Object %d is not a JPEG picture!\n",id);
+	fprintf(stderr, "Object %d is not a JPEG picture!\n", id);
 	exit(1);
     }
 }
@@ -674,11 +779,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;
@@ -738,7 +843,7 @@ void handlelossless(TAG*tag)
     }
     msg("<verbose> Uncompressed image is %d bytes (%d colormap)", datalen, (3+alpha)*cols);
     pos = 0;
-    datalen2 = datalen;
+    datalen2 = datalen+16;
     data2 = malloc(datalen2);
     palette = (RGBA*)malloc(cols*sizeof(RGBA));
 
@@ -786,12 +891,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;y<height;y++)
 	{
@@ -842,7 +956,7 @@ void handlelossless(TAG*tag)
 }
 #endif
 
-FILE*mp3file;
+static FILE*mp3file=0;
 void handlesoundstream(TAG*tag)
 {
     char*filename = "output.mp3";
@@ -923,6 +1037,30 @@ void handledefinesound(TAG*tag)
     fclose(fi);
 }
 
+void handlebinary(TAG*tag) {
+    FILE *fout = NULL;
+    char buf[100];
+    char *filename = buf;
+    int len = tag->memsize;
+    int dx = 6; // offset to binary data
+    if (tag->id!=ST_DEFINEBINARY) {
+        fprintf(stderr, "Object %d is not a binary entity!\n",
+                        GET16(tag->data));
+        return;
+    }
+    sprintf(buf, "binary%d.bin", GET16(tag->data));
+    if(numextracts==1) {
+	filename = destfilename;
+	if(!strcmp(filename,"output.swf")) {
+	    sprintf(buf, "output.bin");
+	    filename = buf;
+	}
+    }
+    fout = fopen(filename, "wb");
+    fwrite(tag->data+dx,len-dx,1,fout);
+    fclose(fout);
+}
+
 int main (int argc,char ** argv)
 { 
     TAG*tag;
@@ -936,9 +1074,14 @@ int main (int argc,char ** argv)
     processargs(argc, argv);
 
     if(!extractframes && !extractids && ! extractname && !extractjpegids && !extractpngids
-	&& !extractmp3 && !extractsoundids && !extractfontids)
+	&& !extractmp3 && !extractsoundids && !extractfontids && !extractbinaryids)
 	listavailable = 1;
 
+    if(!originalplaceobjects && movetozero) {
+	fprintf(stderr, "Error: -0 (--movetozero) can only be used in conjunction with -P (--placeobject)\n");
+	return 0;
+    }
+
     if(!filename)
     {
         fprintf(stderr, "You must supply a filename.\n");
@@ -1016,8 +1159,9 @@ int main (int argc,char ** argv)
 		handlesoundstream(tag);
 	}
 
-	if(tag->id == ST_JPEGTABLES)
+	if(tag->id == ST_JPEGTABLES) {
 	    handlejpegtables(tag);
+	}
 
 	if(swf_isDefiningTag(tag)) {
 	    int id = swf_GetDefineID(tag);
@@ -1035,6 +1179,9 @@ int main (int argc,char ** argv)
 	    if(extractsoundids && is_in_range(id, extractsoundids)) {
 		handledefinesound(tag);
 	    }
+	    if(extractbinaryids && is_in_range(id, extractbinaryids)) {
+		handlebinary(tag);
+	    }
 #ifdef _ZLIB_INCLUDED_
 	    if(extractpngids && is_in_range(id, extractpngids)) {
 		handlelossless(tag);
@@ -1046,13 +1193,15 @@ int main (int argc,char ** argv)
 	    maing = tag->data[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;
 	    }
@@ -1077,8 +1226,13 @@ int main (int argc,char ** argv)
     if (found)
 	extractTag(&swf, destfilename);
 
-    if(mp3file)
+    if(mp3file) {
 	fclose(mp3file);
+    } else {
+        if(extractmp3) {
+            msg("<error> Didn't find a soundstream in file");
+        }
+    }
 
     swf_FreeTags(&swf);
     return 0;