X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;ds=sidebyside;f=src%2Fswfdump.c;h=d17a94a8d3324cbb3d9d3cd03d2b377410e90be1;hb=6287c3aded8d9fb8dd645a81b2950709d2cdba17;hp=8eaeb2564f7a543eee15d81c46b7f96eb64c36f7;hpb=68f177fd64d6321b8c71acc1ad81f9231a22a492;p=swftools.git

diff --git a/src/swfdump.c b/src/swfdump.c
index 8eaeb25..d17a94a 100644
--- a/src/swfdump.c
+++ b/src/swfdump.c
@@ -303,7 +303,7 @@ void handleDefineSound(TAG*tag)
 {
     U16 id = swf_GetU16(tag);
     U8 flags = swf_GetU8(tag);
-    int compression = (flags>>4)&3;
+    int compression = (flags>>4)&7;
     int rate = (flags>>2)&3;
     int bits = flags&2?16:8;
     int stereo = flags&1;
@@ -311,6 +311,8 @@ void handleDefineSound(TAG*tag)
     if(compression == 0) printf("Raw ");
     else if(compression == 1) printf("ADPCM ");
     else if(compression == 2) printf("MP3 ");
+    else if(compression == 3) printf("Raw little-endian ");
+    else if(compression == 6) printf("ASAO ");
     else printf("? ");
     if(rate == 0) printf("5.5Khz ");
     if(rate == 1) printf("11Khz ");
@@ -471,15 +473,17 @@ void handleVideoFrame(TAG*tag, char*prefix)
     printf(" quant: %d ", quantizer);
 }
 
-void handlePlaceObject2(TAG*tag, char*prefix)
+void handlePlaceObject23(TAG*tag, char*prefix)
 {
-    U8 flags;
+    U8 flags,flags2=0;
     MATRIX m;
     CXFORM cx;
-    char pstr[3][160];
+    char pstr[3][256];
     int ppos[3] = {0,0,0};
     swf_SetTagPos(tag, 0);
     flags = swf_GetU8(tag);
+    if(tag->id == ST_PLACEOBJECT3)
+	flags2 = swf_GetU8(tag);
     swf_GetU16(tag); //depth
 
     //flags&1: move
@@ -512,11 +516,40 @@ void handlePlaceObject2(TAG*tag, char*prefix)
 	U16 clip = swf_GetU16(tag); //clip
 	if(placements) {
 	    ppos[0] += sprintf(pstr[0]+ppos[0], "| Clip  ");
-	    ppos[1] += sprintf(pstr[1]+ppos[1], "| %-5d ", clip);
+	    ppos[1] += sprintf(pstr[1]+ppos[1], "| %-4d ", clip);
 	    ppos[2] += sprintf(pstr[2]+ppos[2], "|       ");
 	}
     }
     if(flags&32) { while(swf_GetU8(tag)); }
+
+    if(flags2&1) { // filter list
+	U8 num = swf_GetU8(tag);
+	printf("%d filters\n");
+	char*filtername[] = {"dropshadow","blur","glow","bevel","gradientglow","convolution","colormatrix","gradientbevel"};
+	for(;num;num--) {
+	    U8 type = swf_GetU8(tag);
+	    printf("filter %d: %02x (%s)\n", type, type<sizeof(filtername)/sizeof(filtername[0])?filtername[type]:"?");
+	    return;// FIXME
+	}
+    }
+    if(flags2&2) { // blend mode
+	U8 blendmode = swf_GetU8(tag);
+	if(placements) {
+	    int t;
+	    char name[80];
+	    sprintf(name, "%-5d", blendmode);
+	    for(t=0;blendModeNames[t];t++) {
+		if(blendmode==t) {
+		    sprintf(name, "%-5s", blendModeNames[t]);
+		    break;
+		}
+	    }
+	    ppos[0] += sprintf(pstr[0]+ppos[0], "| Blend ");
+	    ppos[1] += sprintf(pstr[1]+ppos[1], "| %s ", name);
+	    ppos[2] += sprintf(pstr[2]+ppos[2], "|       ");
+	}
+    }
+
     if(placements && ppos[0]) {
 	printf("\n");
 	printf("%s %s\n", prefix, pstr[0]);
@@ -586,7 +619,7 @@ void handlePlaceObject(TAG*tag, char*prefix)
     swf_SetMatrix(tag2, &matrix);
     swf_SetCXForm(tag2, &cxform, 1);
 
-    handlePlaceObject2(tag2, prefix);
+    handlePlaceObject23(tag2, prefix);
 }
 char stylebuf[256];
 char* fillstyle2str(FILLSTYLE*style)
@@ -598,14 +631,14 @@ char* fillstyle2str(FILLSTYLE*style)
 	case 0x10: case 0x12:
 	    sprintf(stylebuf, "GRADIENT (%d steps)", style->gradient.num);
 	    break;
-	case 0x40: 
+	case 0x40: case 0x42:
 	    /* TODO: display information about that bitmap */
-	    sprintf(stylebuf, "BITMAPt %d", style->id_bitmap);
+	    sprintf(stylebuf, "BITMAPt%s %d", (style->type&2)?"n":"", style->id_bitmap);
 	    /* TODO: show matrix */
 	    break;
-	case 0x41:
+	case 0x41: case 0x43:
 	    /* TODO: display information about that bitmap */
-	    sprintf(stylebuf, "BITMAPc %d", style->id_bitmap);
+	    sprintf(stylebuf, "BITMAPc%s %d", (style->type&2)?"n":"", style->id_bitmap);
 	    /* TODO: show matrix */
 	    break;
 	default:
@@ -925,11 +958,6 @@ int main (int argc,char ** argv)
 	    printf("[%03x] %9ld %s%s", tag->id, tag->len, prefix, swf_TagGetName(tag));
 	}
 	
-	if(tag->id == ST_FREECHARACTER) {
-	    U16 id = swf_GetU16(tag);
-	    idtab[id] = 0;
-	}
-
         if(swf_isDefiningTag(tag)) {
             U16 id = swf_GetDefineID(tag);
             printf(" defines id %04d", id);
@@ -948,7 +976,7 @@ int main (int argc,char ** argv)
             if(swf_GetName(tag))
                 printf(" name \"%s\"",swf_GetName(tag));
         }
-	else if(tag->id == ST_PLACEOBJECT2) {
+	else if(tag->id == ST_PLACEOBJECT2 || tag->id == ST_PLACEOBJECT3) {
 	    if(tag->data[0]&1)
 		printf(" moves");
 	    else
@@ -960,6 +988,9 @@ int main (int argc,char ** argv)
 		printf(" object");
 
             printf(" at depth %04d", swf_GetDepth(tag));
+
+	    if(tag->data[1]&4)
+		printf(" as bitmap");
 	   
 	    swf_SetTagPos(tag, 0);
 	    if(tag->data[0]&64) {
@@ -1086,7 +1117,7 @@ int main (int argc,char ** argv)
 	    else
 		printf("\n");
 	}
-	else if(tag->id == ST_PLACEOBJECT2) {
+	else if(tag->id == ST_PLACEOBJECT2 || tag->id == ST_PLACEOBJECT3) {
 	}
 	else if(tag->id == ST_NAMECHARACTER) {
 	    swf_GetU16(tag);
@@ -1146,8 +1177,8 @@ int main (int argc,char ** argv)
 	else if(tag->id == ST_PLACEOBJECT) {
 	    handlePlaceObject(tag, myprefix);
 	}
-	else if(tag->id == ST_PLACEOBJECT2) {
-	    handlePlaceObject2(tag, myprefix);
+	else if(tag->id == ST_PLACEOBJECT2 || tag->id == ST_PLACEOBJECT3) {
+	    handlePlaceObject23(tag, myprefix);
 	}
 	else if(tag->id == ST_DEFINESHAPE ||
 		tag->id == ST_DEFINESHAPE2 ||
@@ -1176,6 +1207,13 @@ int main (int argc,char ** argv)
 		printf("\n");
 	    }
 	}
+	
+	if(tag->id == ST_FREECHARACTER) {
+	    U16 id;
+	    swf_SetTagPos(tag, 0);
+	    id = swf_GetU16(tag);
+	    idtab[id] = 0;
+	}
 
 	if(tag->len && hex) {
 	    hexdumpTag(tag, prefix);