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

diff --git a/src/swfdump.c b/src/swfdump.c
index 157c18c..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}
@@ -398,7 +409,7 @@ void handleVideoFrame(TAG*tag, char*prefix)
     U16 id = swf_GetU16(tag);
     U16 frame = swf_GetU16(tag);
     U8 deblock,flags, tmp, bit;
-    U32 quantizer, extrainfo;
+    U32 quantizer;
     char*types[] = {"I-frame", "P-frame", "disposable P-frame", "<reserved>"};
     printf(" (frame %d) ", frame);
 
@@ -410,7 +421,7 @@ void handleVideoFrame(TAG*tag, char*prefix)
     sizeflags = swf_GetBits(tag, 3);
     switch(sizeflags)
     {
-	case 0: width = swf_GetU8(tag); height = swf_GetU8(tag); break;
+	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;
@@ -423,6 +434,11 @@ void handleVideoFrame(TAG*tag, char*prefix)
     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)
@@ -532,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);
 	}
     }
 }
@@ -617,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)
     { 
@@ -733,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);
@@ -873,6 +905,11 @@ int main (int argc,char ** argv)
 	    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);