X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fswfdump.c;h=5679451c25d3415acb1096f01639663947ae6ecc;hb=5480f1eae83c641a75b225db52bbfc1fcb62e6b6;hp=8a4fc8e77125ab6056465cdac7a6ee0a08735b6e;hpb=a66bd590b4417781c8323f4abf0b85a4d1066dca;p=swftools.git

diff --git a/src/swfdump.c b/src/swfdump.c
index 8a4fc8e..5679451 100644
--- a/src/swfdump.c
+++ b/src/swfdump.c
@@ -4,8 +4,20 @@
    Part of the swftools package.
    
    Copyright (c) 2001 Matthias Kramm <kramm@quiss.org>
+ 
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
 
-   This file is distributed under the GPL, see file COPYING for details */
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 #include "../config.h"
 
@@ -56,7 +68,6 @@ struct options_t options[] =
  {"e","html"},
  {"p","placements"},
  {"u","used"},
- {"v","verbose"},
  {"V","version"},
  {"d","hex"},
  {0,0}
@@ -128,14 +139,14 @@ void args_callback_usage(char*name)
 {    
     printf("Usage: %s [-at] file.swf\n", name);
     printf("\t-h , --help\t\t Print help and exit\n");
-    printf("\t-D , --full\t\t Show everything. The same as -atp\n");
+    printf("\t-D , --full\t\t Show everything. The same as -atMp\n");
     printf("\t-e , --html\t\t Create html output embedding the file (simple, but useful)\n");
     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-p , --placements\t\t Show extra placement information\n");
+    printf("\t-p , --placements\t Show extra placement information\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");
     printf("\t-u , --used\t\t Show referred IDs for each Tag\n");
@@ -250,7 +261,9 @@ void textcallback(int*glyphs, int nr, int fontid)
     {
 	unsigned char a; 
 	if(font>=0) {
-	    if(glyphs[t] >= fonts[font]->numchars)
+	    if(glyphs[t] >= fonts[font]->numchars  /*glyph is in range*/
+		    || !fonts[font]->glyph2ascii /* font has ascii<->glyph mapping */
+	      )
 		continue;
 	    a = fonts[font]->glyph2ascii[glyphs[t]];
 	} else {
@@ -372,6 +385,62 @@ void printhandlerflags(U16 handlerflags)
     if(handlerflags&256) printf("[data]");
     if(handlerflags&0xfe00) printf("[???]");
 }
+void handleVideoStream(TAG*tag, char*prefix)
+{
+    U16 id = swf_GetU16(tag);
+    U16 frames = swf_GetU16(tag);
+    U16 width = swf_GetU16(tag);
+    U16 height = swf_GetU16(tag);
+    U8 flags = swf_GetU8(tag); //5-2(videopacket 01=off 10=on)-1(smoothing 1=on)
+    U8 codec = swf_GetU8(tag);
+    printf(" (%d frames, %dx%d", frames, width, height);
+    if(flags&1)
+	printf(" smoothed");
+    if(codec == 2)
+	printf(" sorenson h.263)");
+    else
+	printf(" codec 0x%02x)", codec);
+}
+void handleVideoFrame(TAG*tag, char*prefix)
+{
+    U32 code, version, reference, sizeflags;
+    U32 width, height;
+    U8 type;
+    U16 id = swf_GetU16(tag);
+    U16 frame = swf_GetU16(tag);
+    U8 deblock,flags, tmp, bit;
+    U32 quantizer;
+    char*types[] = {"I-frame", "P-frame", "disposable P-frame", "<reserved>"};
+    printf(" (frame %d) ", frame);
+
+    /* video packet follows */
+    code = swf_GetBits(tag, 17);
+    version = swf_GetBits(tag, 5);
+    reference = swf_GetBits(tag, 8);
+
+    sizeflags = swf_GetBits(tag, 3);
+    switch(sizeflags)
+    {
+	case 0: width = swf_GetBits(tag, 8); height = swf_GetBits(tag, 8); break;
+	case 1: width = swf_GetBits(tag, 16); height = swf_GetBits(tag, 16); break;
+	case 2: width = 352; height = 288; break;
+	case 3: width = 176; height = 144; break;
+	case 4: width = 128; height = 96; break;
+	case 5: width = 320; height = 240; break;
+	case 6: width = 160; height = 120; break;
+	case 7: width = -1; height = -1;/*reserved*/ break;
+    }
+    printf("%dx%d ", width, height);
+    type = swf_GetBits(tag, 2);
+    printf("%s", types[type]);
+
+    deblock = swf_GetBits(tag, 1);
+    if(deblock)
+	printf(" deblock ", deblock);
+    quantizer = swf_GetBits(tag, 5);
+    printf(" quant: %d ", quantizer);
+}
+
 void handlePlaceObject2(TAG*tag, char*prefix)
 {
     U8 flags = swf_GetU8(tag);
@@ -479,18 +548,30 @@ void fontcallback2(U16 id,U8 * name)
   fontnum++;
 }
 
+static U8 printable(U8 a)
+{
+    if(a<32 || a==127) return '.';
+    else return a;
+}
 void hexdumpTag(TAG*tag, char* prefix)
 {
     int t;
+    char ascii[32];
     printf("                %s-=> ",prefix);
     for(t=0;t<tag->len;t++) {
 	printf("%02x ", tag->data[t]);
+	ascii[t&15] = printable(tag->data[t]);
 	if((t && ((t&15)==15)) || (t==tag->len-1))
 	{
+	    int s,p=((t-1)&15)+1;
+	    ascii[p] = 0;
+	    for(s=p;s<16;s++) {
+		printf("   ");
+	    }
 	    if(t==tag->len-1)
-		printf("\n");
+		printf(" %s\n", ascii);
 	    else
-		printf("\n                %s-=> ",prefix);
+		printf(" %s\n                %s-=> ",ascii,prefix);
 	}
     }
 }
@@ -564,7 +645,7 @@ int main (int argc,char ** argv)
         return 1;
     }
 
-    f = open(filename,O_RDONLY);
+    f = open(filename,O_RDONLY|O_BINARY);
 
     if (f<0)
     { 
@@ -680,10 +761,14 @@ int main (int argc,char ** argv)
         char myprefix[128];
         if(!name) {
             dumperror("Unknown tag:0x%03x", tag->id);
-            tag = tag->next;
-            continue;
+            //tag = tag->next;
+            //continue;
         }
-        printf("[%03x] %9ld %s%s", tag->id, tag->len, prefix, swf_TagGetName(tag));
+	if(swf_TagGetName(tag)) {
+	    printf("[%03x] %9ld %s%s", tag->id, tag->len, prefix, swf_TagGetName(tag));
+	} else {
+	    printf("[%03x] %9ld %sUNKNOWN TAG %03x", tag->id, tag->len, prefix, tag->id);
+	}
 	
 	if(tag->id == ST_FREECHARACTER) {
 	    U16 id = swf_GetU16(tag);
@@ -808,10 +893,23 @@ int main (int argc,char ** argv)
 	    handleDefineSound(tag);
 	    printf("\n");
 	}
+	else if(tag->id == ST_VIDEOFRAME) {
+	    handleVideoFrame(tag, myprefix);
+	    printf("\n");
+	}
+	else if(tag->id == ST_DEFINEVIDEOSTREAM) {
+	    handleVideoStream(tag, myprefix);
+	    printf("\n");
+	}
 	else if(tag->id == ST_DEFINEEDITTEXT) {
 	    handleEditText(tag);
 	    printf("\n");
 	}
+	else if(tag->id == ST_DEFINEMOVIE) {
+	    U16 id = swf_GetU16(tag);
+	    char*s = swf_GetString(tag);
+	    printf(" URL: %s\n", s);
+	}
 	else if(tag->id == ST_DEFINETEXT || tag->id == ST_DEFINETEXT2) {
 	    if(showtext)
 		handleText(tag);