X-Git-Url: http://git.asbjorn.biz/?p=swftools.git;a=blobdiff_plain;f=src%2Fswfextract.c;h=28a45a349e814136ffbf767120be6a2c5e3f35de;hp=1ed064f48b38dabe383e0b9194b2cb14528d9a39;hb=0e8807d9a620e8932bc67653321eaae1436fdd43;hpb=ab7a63b343b9edf7b12661072109cb486e10c93e

diff --git a/src/swfextract.c b/src/swfextract.c
index 1ed064f..28a45a3 100644
--- a/src/swfextract.c
+++ b/src/swfextract.c
@@ -13,7 +13,6 @@
 #include "../lib/rfxswf.h"
 #include "../lib/args.h"
 #include "../lib/log.h"
-#include "reloc.h"
 #ifdef HAVE_ZLIB_H
 #ifdef HAVE_LIBZ
 #include "zlib.h"
@@ -29,6 +28,7 @@ char* extractids = 0;
 char* extractframes = 0;
 char* extractjpegids = 0;
 char* extractpngids = 0;
+char* extractsoundids = 0;
 char extractmp3 = 0;
 
 char* extractname = 0;
@@ -46,6 +46,7 @@ struct options_t options[] =
  {"j","jpegs"},
  {"p","pngs"},
  {"m","mp3"},
+ {"s","sound"},
  {"n","name"},
  {"f","frame"},
  {"V","version"},
@@ -99,6 +100,15 @@ int args_callback_option(char*name,char*val)
 	extractjpegids = val;
 	return 1;
     } 
+    else if(!strcmp(name, "s")) {
+	if(extractsoundids) {
+	    fprintf(stderr, "Only one --sound argument is allowed. (Try to use a range, e.g. -s 1,2,3)\n");
+	    exit(1);
+	}
+	numextracts++;
+	extractsoundids = val;
+	return 1;
+    } 
 #ifdef _ZLIB_INCLUDED_
     else if(!strcmp(name, "p")) {
 	if(extractpngids) {
@@ -135,17 +145,22 @@ void args_callback_usage(char*name)
     printf("Usage: %s [-v] [-n name] [-ijf ids] file.swf\n", name);
     printf("\t-v , --verbose\t\t\t Be more verbose\n");
     printf("\t-o , --output filename\t\t set output filename\n");
-    printf("\t-n , --name name\t\t instance name of the object to extract\n");
-    printf("\t-i , --id IDs\t\t\t ID of the object to extract\n");
-    printf("\t-j , --jpeg IDs\t\t\t IDs of the JPEG pictures to extract\n");
-#ifdef _ZLIB_INCLUDED_
-    printf("\t-p , --pngs IDs\t\t\t IDs of the PNG pictures to extract\n");
-#endif
-    printf("\t-m , --mp3\t\t\t Extract main mp3 stream\n");
+    printf("\t-V , --version\t\t\t Print program version and exit\n\n");
+    printf("SWF Subelement extraction:\n");
+    printf("\t-n , --name name\t\t instance name of the object (SWF Define) to extract\n");
+    printf("\t-i , --id ID\t\t\t ID of the object (SWF Define) to extract\n");
     printf("\t-f , --frame frames\t\t frame numbers to extract\n");
     printf("\t-w , --hollow\t\t\t hollow mode: don't remove empty frames\n"); 
     printf("\t             \t\t\t (use with -f)\n");
-    printf("\t-V , --version\t\t\t Print program version and exit\n");
+    printf("Picture extraction:\n");
+    printf("\t-j , --jpeg ID\t\t\t Extract JPEG picture(s)\n");
+#ifdef _ZLIB_INCLUDED_
+    printf("\t-p , --pngs ID\t\t\t Extract PNG picture(s)\n");
+#endif
+    printf("\n");
+    printf("Sound extraction:\n");
+    printf("\t-m , --mp3\t\t\t Extract main mp3 stream\n");
+    printf("\t-s , --sound ID\t\t\t Extract Sound(s)\n");
 }
 int args_callback_command(char*name,char*val)
 {
@@ -178,7 +193,7 @@ void idcallback(void*data)
 
 void enumerateIDs(TAG*tag, void(*callback)(void*))
 {
-    U8*data;
+/*    U8*data;
     int len = tag->len;
     if(tag->len>=64) {
 	len += 6;
@@ -196,6 +211,13 @@ void enumerateIDs(TAG*tag, void(*callback)(void*))
 	memcpy(&data[2], tag->data, tag->len);
     }
     map_ids_mem(data, len, callback);
+ */
+    int num = swf_GetNumUsedIDs(tag);
+    int *ptr = malloc(sizeof(int)*num);
+    int t;
+    swf_GetUsedIDs(tag, ptr);
+    for(t=0;t<num;t++)
+	callback(&tag->data[ptr[t]]);
 }
 
 void extractTag(SWF*swf, char*filename)
@@ -423,7 +445,7 @@ void handlejpeg(TAG*tag)
 	fwrite(&tag->data[2+2], tag->len-2-2, 1, fi); //don't write start tag (ff,d9)
 	fclose(fi);
     }
-    if(tag->id == ST_DEFINEBITSJPEG2 && tag->len>2) {
+    else if(tag->id == ST_DEFINEBITSJPEG2 && tag->len>2) {
 	int end = tag->len;
 	int pos = findjpegboundary(&tag->data[2], tag->len-2);
 	if(pos<0)
@@ -434,7 +456,7 @@ void handlejpeg(TAG*tag)
 	fwrite(&tag->data[pos+4], end-(pos+4), 1, fi);
 	fclose(fi);
     }
-    if(tag->id == ST_DEFINEBITSJPEG3 && tag->len>6) {
+    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)
@@ -445,6 +467,11 @@ void handlejpeg(TAG*tag)
 	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);
+	exit(1);
+    }
 }
 
 #ifdef _ZLIB_INCLUDED_
@@ -536,8 +563,11 @@ void handlelossless(TAG*tag)
     make_crc32_table();
 
     if(tag->id != ST_DEFINEBITSLOSSLESS &&
-       tag->id != ST_DEFINEBITSLOSSLESS2)
-	return;
+       tag->id != ST_DEFINEBITSLOSSLESS2) {
+	int id = GET16(tag->data);
+	fprintf(stderr, "Object %d is not a PNG picture!\n",id);
+	exit(1);
+    }
 
     id =swf_GetU16(tag);
     format = swf_GetU8(tag);
@@ -686,7 +716,7 @@ void handlesoundstream(TAG*tag)
 	break;
 	case ST_SOUNDSTREAMHEAD2:
 	    if((tag->data[1]&0x30) == 0x20) {//mp3 compression
-		mp3file = fopen("mainstream.mp3", "wb");
+		mp3file = fopen(filename, "wb");
 		logf("<notice> Writing mp3 data to %s",filename);
 	    }
 	    else
@@ -699,6 +729,37 @@ void handlesoundstream(TAG*tag)
     }
 }
 
+void handledefinesound(TAG*tag)
+{
+    U8 flags;
+    U32 samples;
+    char buf[128];
+    char*filename = buf;
+    FILE*fi;
+    U16 id;
+    id = swf_GetU16(tag); //id
+    sprintf(buf, "sound%d.mp3", id);
+
+    if(numextracts==1) {
+	filename = destfilename;
+	if(!strcmp(filename,"output.swf"))
+	    filename = "output.mp3";
+    }
+    flags = swf_GetU8(tag);
+    if((flags>>4)!=2) {
+	printf("Sorry, can only extract MP3 sounds. Sound %d is ADPCM or RAW.\n", id);
+	/* not mp3 */
+	return;
+    }
+    samples = swf_GetU32(tag);
+    
+    swf_GetU16(tag); //(only for mp3) numsamples_seek
+
+    fi = save_fopen(filename, "wb");
+    fwrite(&tag->data[tag->pos], tag->len - tag->pos, 1, fi);
+    fclose(fi);
+}
+
 int main (int argc,char ** argv)
 { 
     TAG*tag;
@@ -712,7 +773,7 @@ int main (int argc,char ** argv)
     processargs(argc, argv);
 
     if(!extractframes && !extractids && ! extractname && !extractjpegids && !extractpngids
-	&& !extractmp3)
+	&& !extractmp3 && !extractsoundids)
 	listavailable = 1;
 
     if(!filename)
@@ -788,7 +849,8 @@ int main (int argc,char ** argv)
 	if(tag->id == ST_SOUNDSTREAMHEAD ||
 	   tag->id == ST_SOUNDSTREAMHEAD2 ||
 	   tag->id == ST_SOUNDSTREAMBLOCK) {
-	    handlesoundstream(tag);
+	    if(extractmp3)
+		handlesoundstream(tag);
 	}
 
 	if(tag->id == ST_JPEGTABLES)
@@ -804,6 +866,9 @@ int main (int argc,char ** argv)
 	    if(extractjpegids && is_in_range(id, extractjpegids)) {
 		handlejpeg(tag);
 	    }
+	    if(extractsoundids && is_in_range(id, extractsoundids)) {
+		handledefinesound(tag);
+	    }
 #ifdef _ZLIB_INCLUDED_
 	    if(extractpngids && is_in_range(id, extractpngids)) {
 		handlelossless(tag);