added 32 bit alpha handling for DEFINEBITSLOSSLESS2.

[swftools.git] / src / swfextract.c

diff --git a/src/swfextract.c b/src/swfextract.c
index 723c599..80ca272 100644 (file)
--- a/src/swfextract.c
+++ b/src/swfextract.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 <unistd.h>
 #include <stdio.h>
@@ -273,7 +285,9 @@ void extractTag(SWF*swf, char*filename)
        changed = 0;
        for(t=0;t<65536;t++) {
           if(used[t] && !(used[t]&2)) {
-            if(tags[t]->id==ST_DEFINESPRITE) {
+            if(tags[t]==0) {
+                msg("<warning> ID %d is referenced, but never defined.", t);
+            } else if(tags[t]->id==ST_DEFINESPRITE) {
                 TAG*tag = tags[t];
                 while(tag->id != ST_END)
                 {
@@ -579,7 +593,7 @@ static void make_crc32_table(void)
     crc32_table[t] = c;
   }
 }
-static void png_write_byte(FILE*fi, U8 byte)
+static inline void png_write_byte(FILE*fi, U8 byte)
 {
     fwrite(&byte,1,1,fi);
     mycrc32 = crc32_table[(mycrc32 ^ byte) & 0xff] ^ (mycrc32 >> 8);
@@ -724,8 +738,10 @@ void handlelossless(TAG*tag)
      png_write_byte(fi,8);
      if(format == 3)
      png_write_byte(fi,3); //indexed
-     else if(format == 5)
+     else if(format == 5 && alpha==0)
      png_write_byte(fi,2); //rgb
+     else if(format == 5 && alpha==1)
+     png_write_byte(fi,6); //rgba
      else return;
 
      png_write_byte(fi,0); //compression mode
@@ -735,6 +751,7 @@ void handlelossless(TAG*tag)
    
     if(format == 3) {
        png_start_chunk(fi, "PLTE", 768);
+        
         for(t=0;t<256;t++) {
             png_write_byte(fi,palette[t].r);
             png_write_byte(fi,palette[t].g);
@@ -752,12 +769,22 @@ void handlelossless(TAG*tag)
        {
           data3[pos2++]=0; //filter type
           if(bpp==32) {
-           // 32 bit to 24 bit "conversion"
-           for(x=0;x<width;x++) {
-               data3[pos2++]=data[pos+1];
-               data3[pos2++]=data[pos+2];
-               data3[pos2++]=data[pos+3];
-               pos+=4; //ignore padding byte
+           if(!alpha) {
+               // 32 bit to 24 bit "conversion"
+               for(x=0;x<width;x++) {
+                   data3[pos2++]=data[pos+1];
+                   data3[pos2++]=data[pos+2];
+                   data3[pos2++]=data[pos+3];
+                   pos+=4; //ignore padding byte
+               }
+           } else {
+               for(x=0;x<width;x++) {
+                   data3[pos2++]=data[pos+1];
+                   data3[pos2++]=data[pos+2];
+                   data3[pos2++]=data[pos+3];
+                   data3[pos2++]=data[pos+0]; //alpha
+                   pos+=4;
+               }
            }
           }
           else {
@@ -827,25 +854,40 @@ void handledefinesound(TAG*tag)
     char buf[128];
     char*filename = buf;
     FILE*fi;
+    char*extension = 0;
+    int format;
     U16 id;
+    int rate,bits,stereo;
+    char*rates[] = {"5500","11025","22050","44100"};
     id = swf_GetU16(tag); //id
-    sprintf(buf, "sound%d.mp3", id);
+    
+    flags = swf_GetU8(tag);
+    format = flags>>4;
+    rate = (flags>>2)&3;
+    bits = flags&2?16:8;
+    stereo = flags&1;
+    
+    samples = swf_GetU32(tag);
 
+    if(format == 2) { // mp3
+       swf_GetU16(tag); //numsamples_seek
+       extension = "mp3";
+    } else if(format == 0) { // raw
+       printf("Sound is RAW, format: %s samples/sec, %d bit, %s\n", rates[rate], bits, stereo?"stereo":"mono");
+       // TODO: convert to WAV
+       extension = "raw";
+    } else if(format == 1) { // adpcm
+       printf("Sound is ADPCM, format: %s samples/sec, %d bit, %s\n", rates[rate], bits, stereo?"stereo":"mono");
+       extension = "adpcm";
+    }
+    sprintf(buf, "sound%d.%s", id, extension);
     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;
+       if(!strcmp(filename,"output.swf")) {
+           sprintf(buf, "output.%s", extension);
+           filename = buf;
+       }
     }
-    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);