X-Git-Url: http://git.asbjorn.biz/?p=swftools.git;a=blobdiff_plain;f=src%2Fswfdump.c;h=3a87f4227956b8135dceb9f1caa08ad40950ae8b;hp=4902873fe37d954bb65ed962277975fdfd3a6acf;hb=0e8807d9a620e8932bc67653321eaae1436fdd43;hpb=495eb07179f8739f49496cfe79223cd85baf2bdd

diff --git a/src/swfdump.c b/src/swfdump.c
index 4902873..3a87f42 100644
--- a/src/swfdump.c
+++ b/src/swfdump.c
@@ -49,6 +49,7 @@ struct options_t options[] =
  {"t","text"},
  {"X","width"},
  {"Y","height"},
+ {"f","frames"},
  {"r","rate"},
  {"e","html"},
  {"u","used"},
@@ -89,6 +90,10 @@ int args_callback_option(char*name,char*val)
 	xy |= 4;
 	return 0;
     }
+    else if(name[0]=='f') {
+	xy |= 8;
+	return 0;
+    }
     else if(name[0]=='d') {
 	hex = 1;
 	return 0;
@@ -115,6 +120,7 @@ void args_callback_usage(char*name)
     printf("\t-X , --width\t\t Prints out a string of the form \"-X width\"\n");
     printf("\t-Y , --height\t\t Prints out a string of the form \"-Y height\"\n");
     printf("\t-r , --rate\t\t Prints out a string of the form \"-r rate\"\n");
+    printf("\t-f , --frames\t\t Prints out a string of the form \"-f framenum\"\n");
     printf("\t-a , --action\t\t Disassemble action tags\n");
     printf("\t-t , --text\t\t Show text data\n");
     printf("\t-d , --hex\t\t Print hex output of tag data, too\n");
@@ -250,6 +256,29 @@ void handleText(TAG*tag)
   swf_FontExtract_DefineTextCallback(-1,0,tag,4, textcallback);
 }
 	    
+void handleDefineSound(TAG*tag)
+{
+    U16 id = swf_GetU16(tag);
+    U8 flags = swf_GetU8(tag);
+    int compression = (flags>>4)&3;
+    int rate = (flags>>2)&3;
+    int bits = flags&2?16:8;
+    int stereo = flags&1;
+    printf(" (");
+    if(compression == 0) printf("Raw ");
+    else if(compression == 1) printf("ADPCM ");
+    else if(compression == 2) printf("MP3 ");
+    else printf("? ");
+    if(rate == 0) printf("5.5Khz ");
+    if(rate == 1) printf("11Khz ");
+    if(rate == 2) printf("22Khz ");
+    if(rate == 3) printf("44Khz ");
+    printf("%dBit ", bits);
+    if(stereo) printf("stereo");
+    else printf("mono");
+    printf(")");
+}
+
 void handleDefineBits(TAG*tag)
 {
     U16 id;
@@ -393,6 +422,22 @@ void fontcallback2(U16 id,U8 * name)
   fontnum++;
 }
 
+void hexdumpTag(TAG*tag, char* prefix)
+{
+    int t;
+    printf("                %s-=> ",prefix);
+    for(t=0;t<tag->len;t++) {
+	printf("%02x ", tag->data[t]);
+	if((t && ((t&15)==15)) || (t==tag->len-1))
+	{
+	    if(t==tag->len-1)
+		printf("\n");
+	    else
+		printf("\n                %s-=> ",prefix);
+	}
+    }
+}
+
 void dumperror(const char* format, ...)
 {
     char buf[1024];
@@ -406,6 +451,21 @@ void dumperror(const char* format, ...)
 	printf("==== Error: %s ====\n", buf);
 }
 
+static char strbuf[800];
+static int bufpos=0;
+
+char* timestring(double f)
+{
+    int hours   = (int)(f/3600);
+    int minutes = (int)((f-hours*3600)/60);
+    int seconds = (int)((f-hours*3600-minutes*60));
+    int useconds = (int)((f-(int)f)*1000+0.5);
+    bufpos+=100;
+    bufpos%=800;
+    sprintf(&strbuf[bufpos], "%02d:%02d:%02d,%03d",hours,minutes,seconds,useconds);
+    return &strbuf[bufpos];
+}
+
 int main (int argc,char ** argv)
 { 
     TAG*tag;
@@ -475,6 +535,12 @@ int main (int argc,char ** argv)
 	if(xy&4)
 	printf("-r %d", swf.frameRate*100/256);
 	
+	if((xy&7) && (xy&8))
+	printf(" ");
+	
+	if(xy&8)
+	printf("-f %d", swf.frameCount);
+	
 	printf("\n");
 	return 0;
     }
@@ -583,8 +649,27 @@ int main (int argc,char ** argv)
         else if(tag->id == ST_REMOVEOBJECT2) {
             printf(" removes object from depth %04d", swf_GetDepth(tag));
         }
+        else if(tag->id == ST_FREECHARACTER) {
+            printf(" frees object %04d", swf_GetPlaceID(tag));
+        }
 	else if(tag->id == ST_STARTSOUND) {
-	    printf(" starts id %04d", swf_GetPlaceID(tag));
+	    U8 flags;
+	    U16 id;
+	    id = swf_GetU16(tag);
+	    flags = swf_GetU8(tag);
+	    if(flags & 32)
+		printf(" stops sound with id %04d", id);
+	    else
+		printf(" starts sound with id %04d", id);
+	    if(flags & 16)
+		printf(" (if not already playing)");
+	    if(flags & 1)
+		swf_GetU32(tag);
+	    if(flags & 2)
+		swf_GetU32(tag);
+	    if(flags & 4) {
+		printf(" looping %d times", swf_GetU16(tag));
+	    }
 	}
 	else if(tag->id == ST_FRAMELABEL) {
 	    int l = strlen(tag->data);
@@ -615,20 +700,34 @@ int main (int argc,char ** argv)
 		}
 	    }
 	    if(nframe == frame)
-		printf(" %d", frame);
+		printf(" %d (%s)", frame, timestring(frame*(256.0/(swf.frameRate+0.1))));
 	    else
-		printf(" %d-%d", frame, nframe);
+		printf(" %d-%d (%s-%s)", frame, nframe,
+			timestring(frame*(256.0/(swf.frameRate+0.1))),
+			timestring(nframe*(256.0/(swf.frameRate+0.1)))
+			);
 	    if(label)
 		printf(" (label \"%s\")", label);
 	    if(issprite) {spriteframe++; spriteframelabel = 0;}
 	    if(!issprite) {mainframe++; framelabel = 0;}
 	}
 
+	if(tag->id == ST_SETBACKGROUNDCOLOR) {
+	    U8 r = swf_GetU8(tag);
+	    U8 g = swf_GetU8(tag);
+	    U8 b = swf_GetU8(tag);
+	    printf(" (%02x/%02x/%02x)",r,g,b);
+	}
+
 	if(tag->id == ST_DEFINEBITSLOSSLESS ||
 	   tag->id == ST_DEFINEBITSLOSSLESS2) {
 	    handleDefineBits(tag);
 	    printf("\n");
 	}
+	else if(tag->id == ST_DEFINESOUND) {
+	    handleDefineSound(tag);
+	    printf("\n");
+	}
 	else if(tag->id == ST_DEFINEEDITTEXT) {
 	    handleEditText(tag);
 	    printf("\n");
@@ -690,7 +789,7 @@ int main (int argc,char ** argv)
 		swf_GetUsedIDs(tag, used);
 		printf("%s%suses IDs: ", indent, prefix);
 		for(t=0;t<num;t++) {
-		    tag->pos = used[t];
+		    swf_SetTagPos(tag, used[t]);
 		    printf("%d%s", swf_GetU16(tag), t<num-1?", ":"");
 		}
 		printf("\n");
@@ -698,18 +797,7 @@ int main (int argc,char ** argv)
 	}
 
 	if(tag->len && hex) {
-	    int t;
-	    printf("                %s-=> ",prefix);
-	    for(t=0;t<tag->len;t++) {
-		printf("%02x ", tag->data[t]);
-		if((t && ((t&15)==15)) || (t==tag->len-1))
-		{
-		    if(t==tag->len-1)
-			printf("\n");
-		    else
-			printf("\n                %s-=> ",prefix);
-		}
-	    }
+	    hexdumpTag(tag, prefix);
 	}
         tag = tag->next;
 	fflush(stdout);