X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fpng2swf.c;h=b1827ed293ab1f71bceabe79440e0dddedf883ce;hb=d0944e4403dd2736e0dde1ba0a6558f71df8da70;hp=c07e4c9a04fa8abce075531131ecae3b987b027a;hpb=aee9de2c6eb23628e54b6896f5b441d9b39317c1;p=swftools.git

diff --git a/src/png2swf.c b/src/png2swf.c
index c07e4c9..b1827ed 100644
--- a/src/png2swf.c
+++ b/src/png2swf.c
@@ -31,13 +31,15 @@
 #define VERBOSE(x) (global.verbose>=x)
 
 struct {
-    int framerate;
+    float framerate;
     int max_image_width;
     int max_image_height;
     int force_width;
     int force_height;
     int nfiles;
     int verbose;
+    int do_cgi;
+    int version;
     char *outfile;
 } global;
 
@@ -45,22 +47,22 @@ struct {
     char *filename;
 } image[MAX_INPUT_FILES];
 
-TAG *MovieStart(SWF * swf, int framerate, int dx, int dy)
+TAG *MovieStart(SWF * swf, float framerate, int dx, int dy)
 {
     TAG *t;
     RGBA rgb;
 
     memset(swf, 0x00, sizeof(SWF));
 
-    swf->fileVersion = 5;
-    swf->frameRate = (25600 / framerate);
+    swf->fileVersion = global.version;
+    swf->frameRate = (int)(256.0 * framerate);
     swf->movieSize.xmax = dx * 20;
     swf->movieSize.ymax = dy * 20;
 
     t = swf->firstTag = swf_InsertTag(NULL, ST_SETBACKGROUNDCOLOR);
 
     rgb.r = rgb.g = rgb.b = rgb.a = 0x00;
-    //rgb.g = 0xff; <--- handy for testing alpha conversion
+    //rgb.g = 0xff; //<--- handy for testing alpha conversion
     swf_SetRGB(t, &rgb);
 
     return t;
@@ -68,21 +70,30 @@ TAG *MovieStart(SWF * swf, int framerate, int dx, int dy)
 
 int MovieFinish(SWF * swf, TAG * t, char *sname)
 {
-    int handle, so = fileno(stdout);
+    int f, so = fileno(stdout);
     t = swf_InsertTag(t, ST_END);
 
     if ((!isatty(so)) && (!sname))
-	handle = so;
+	f = so;
     else {
 	if (!sname)
 	    sname = "output.swf";
-	handle = open(sname, O_BINARY | O_RDWR | O_CREAT | O_TRUNC, 0666);
+	f = open(sname,O_WRONLY|O_CREAT|O_TRUNC|O_BINARY, 0644);
+    }
+
+    if(global.do_cgi) {
+	if FAILED(swf_WriteCGI(swf)) fprintf(stderr,"WriteCGI() failed.\n");
+    } else {
+	if(global.version >= 6) {
+	    if (swf_WriteSWC(f, swf)<0) 
+		    fprintf(stderr, "Unable to write output file: %s\n", sname);
+	} else {
+	    if (swf_WriteSWF(f, swf)<0) 
+		    fprintf(stderr, "Unable to write output file: %s\n", sname);
+	}
+	if (f != so)
+	    close(f);
     }
-    if FAILED
-	(swf_WriteSWF(handle, swf)) if (VERBOSE(1))
-	    fprintf(stderr, "Unable to write output file: %s\n", sname);
-    if (handle != so)
-	close(handle);
 
     swf_FreeTags(swf);
     return 0;
@@ -159,9 +170,19 @@ int png_read_header(FILE*fi, struct png_header*header)
 	    c = data[10];     // compression mode (0)
 	    f = data[11];     // filter mode (0)
 	    i = data[12];     // interlace mode (0)
+	
+	    if(VERBOSE(2)) printf("image mode:%d\n", b);
+	    if(VERBOSE(2)) printf("bpp: %d\n", a);
+	    if(VERBOSE(2)) printf("compression: %d\n", c);
+	    if(VERBOSE(2)) printf("filter: %d\n", f);
+	    if(VERBOSE(2)) printf("interlace: %d\n", i);
 
-	    if(b!=2 && b!=3 && b!=6) {
+	    if(b!=0 && b!=2 && b!=3 && b!=6) {
 		fprintf(stderr, "Image mode %d not supported!\n", b);
+		if(b == 4) {
+		    fprintf(stderr, "(This is a grayscale image with alpha channel-\n");
+		    fprintf(stderr, " try converting it into an RGB image with alpha channel)\n");
+		}
 		exit(1);
 	    }
 	    if(a!=8 && (b==2 || b==6)) {
@@ -294,11 +315,11 @@ void applyfilter4(int mode, U8*src, U8*old, U8*dest, int width)
     unsigned char lastr=0;
     unsigned char lastg=0;
     unsigned char lastb=0;
-    unsigned char lasta=0;
+    unsigned char lasta=0; //TODO: 255?
     unsigned char upperlastr=0;
     unsigned char upperlastg=0;
     unsigned char upperlastb=0;
-    unsigned char upperlasta=0;
+    unsigned char upperlasta=0; //TODO: 255?
 
     if(mode==0) {
 	for(x=0;x<width;x++) {
@@ -341,6 +362,7 @@ void applyfilter4(int mode, U8*src, U8*old, U8*dest, int width)
 	    dest[1] = src[0]+(old[1]+lastr)/2;
 	    dest[2] = src[1]+(old[2]+lastg)/2;
 	    dest[3] = src[2]+(old[3]+lastb)/2;
+	    lasta = dest[0];
 	    lastr = dest[1];
 	    lastg = dest[2];
 	    lastb = dest[3];
@@ -403,6 +425,7 @@ void applyfilter1(int mode, U8*src, U8*old, U8*dest, int width)
     else if(mode==3) {
 	for(x=0;x<width;x++) {
 	    *dest = *src+(*old+last)/2;
+	    last = *dest;
 	    dest++;
 	    old++;
 	    src++;
@@ -454,7 +477,7 @@ TAG *MovieAddFrame(SWF * swf, TAG * t, char *sname, int id)
     if(!png_read_header(fi, &header))
 	return 0;
 
-    if(header.mode == 3) bypp = 1;
+    if(header.mode == 3 || header.mode == 0) bypp = 1;
     else
     if(header.mode == 2) bypp = 3;
     else
@@ -524,7 +547,10 @@ TAG *MovieAddFrame(SWF * swf, TAG * t, char *sname, int id)
 	int pos=0;
 	int opaque=0;
 	int transparent=0;
+	int semitransparent=0;
 	/* in case for mode 2, the following also performs 24->32 bit conversion */
+	unsigned char* firstline = malloc(header.width*4);
+
 	for(y=0;y<header.height;y++) {
 	    int mode = imagedata[pos++]; //filter mode
 	    U8*src;
@@ -543,76 +569,79 @@ TAG *MovieAddFrame(SWF * swf, TAG * t, char *sname, int id)
 	    }
 
 	    if(!y) {
-		memset(data2,0,header.width*4);
-		old = &data2[y*header.width*4];
+		old = firstline;
+		memset(old, 0, header.width*4); //TODO: fill alpha with 255?
 	    } else {
 		old = &data2[(y-1)*header.width*4];
 	    }
 	    if(header.mode==6)
 		applyfilter4(mode, src, old, dest, header.width);
-	    else
+	    else if(header.mode==2)
 		applyfilter3(mode, src, old, dest, header.width);
 	}
+	free(firstline);
 
-#ifdef HAVE_LIBJPEG
 	/* the image is now compressed and stored in data. Now let's take
-	   a look at the alpha values to determine which bitmap type we
-	   should write */
-	if(header.mode == 6)
-	for(y=0;y<header.height;y++) {
-	    U8*l = &data2[(y*header.width)*4];
-	    for(x=0;x<header.width;x++) {
-		if(l[x*4+0]==255) transparent++;
-		if(l[x*4+0]==0) opaque++;
+	   a look at the alpha values */
+	if(header.mode == 6) {
+	    for(y=0;y<header.height;y++) {
+		U8*l = &data2[(y*header.width)*4];
+		for(x=0;x<header.width;x++) {
+		    U8 a = l[x*4];
+		    U8 b = l[x*4+1];
+		    U8 g = l[x*4+2];
+		    U8 r = l[x*4+3];
+		    if(a==255) transparent++;
+		    else {
+			if(a==0) opaque++;
+			else semitransparent++;
+			l[x*4+3]=(int)r*a/255;
+			l[x*4+2]=(int)g*a/255;
+			l[x*4+1]=(int)b*a/255;
+		    }
+		}
+	    }
+	    if(semitransparent || opaque) {
+		t->id = ST_DEFINEBITSLOSSLESS2;
 	    }
 	}
-	/* mode 6 images which are not fully opaque or fully transparent
-	   will be stored as definejpeg3 */
-	if(header.mode == 6 && transparent != header.width*header.height
-		            && opaque != header.width*header.height) {
-	   
-	    printf("Image has transparency information. Storing as DefineBitsJpeg3 Tag (jpeg+alpha)\n");
-
-	    // we always use quality 100, since png2swf is expected to
-	    // use more or less lossless compression
-	    
-	    swf_SetJPEGBits3(t, header.width, header.height, (RGBA*)data2, 100);
-	    t->id = ST_DEFINEBITSJPEG3;
-	} 
-	else
-#endif
-	{
-	    swf_SetLosslessBits(t, header.width, header.height, data2, BMF_32BIT);
-	}
+	swf_SetLosslessBits(t, header.width, header.height, data2, BMF_32BIT);
 	free(data2);
-    }
-    else {
-	RGBA*rgba = (RGBA*)malloc(palettelen*sizeof(RGBA));
+    } else if(header.mode == 0 || header.mode == 3) {
+	RGBA*rgba;
 	int swf_width = BYTES_PER_SCANLINE(header.width);
 	U8*data2 = malloc(swf_width*header.height);
 	U8*tmpline = malloc(header.width);
 	int i,x,y;
 	int pos=0;
-	if(!palette) {
-	    fprintf(stderr, "Error: No palette found!\n");
-	    exit(1);
-	}
-	/* 24->32 bit conversion */
-	for(i=0;i<palettelen;i++) {
-	    rgba[i].r = palette[i*3+0];
-	    rgba[i].g = palette[i*3+1];
-	    rgba[i].b = palette[i*3+2];
-	    if(alphapalette && i<alphapalettelen) {
-		rgba[i].a = alphapalette[i];
-		if(alphapalette[i] == 0) {
-		    /* if the color is fully transparent, it doesn't matter
-		       what it's rgb values are. furthermore, all Flash 
-		       players up to Flash 5 can't deal with anything beyond
-		       one transparent color with value (00,00,00,00). */
-		    rgba[i].r = rgba[i].g = rgba[i].b = 0;
+	if(header.mode == 3) { // palette or grayscale?
+	    rgba = (RGBA*)malloc(palettelen*sizeof(RGBA));
+	    if(!palette) {
+		fprintf(stderr, "Error: No palette found!\n");
+		exit(1);
+	    }
+	    /* 24->32 bit conversion */
+	    for(i=0;i<palettelen;i++) {
+		rgba[i].r = palette[i*3+0];
+		rgba[i].g = palette[i*3+1];
+		rgba[i].b = palette[i*3+2];
+		if(alphapalette && i<alphapalettelen) {
+		    rgba[i].a = alphapalette[i];
+		    rgba[i].r = ((int)rgba[i].r*rgba[i].a)/255;
+		    rgba[i].g = ((int)rgba[i].g*rgba[i].a)/255;
+		    rgba[i].b = ((int)rgba[i].b*rgba[i].a)/255;
+		} else {
+		    rgba[i].a = 255;
 		}
-	    } else {
-		rgba[i].a = 255;
+	    }
+	} else {
+            int mult = (0x1ff>>header.bpp);
+	    palettelen = 1<<header.bpp;
+	    rgba = (RGBA*)malloc(palettelen*sizeof(RGBA));
+	    for(i=0;i<palettelen;i++) {
+		rgba[i].r = i*mult;
+		rgba[i].g = i*mult;
+		rgba[i].b = i*mult;
 	    }
 	}
 
@@ -746,11 +775,11 @@ int args_callback_option(char *arg, char *val)
 	switch (arg[0]) {
 	case 'r':
 	    if (val)
-		global.framerate = atoi(val);
-	    if ((global.framerate < 1) ||(global.framerate > 5000)) {
+		global.framerate = atof(val);
+	    if ((global.framerate < 1.0/256) ||(global.framerate >= 256.0)) {
 		if (VERBOSE(1))
 		    fprintf(stderr,
-			    "Error: You must specify a valid framerate between 1 and 10000.\n");
+			    "Error: You must specify a valid framerate between 1/256 and 255.\n");
 		exit(1);
 	    }
 	    res = 1;
@@ -762,6 +791,15 @@ int args_callback_option(char *arg, char *val)
 	    res = 1;
 	    break;
 
+	case 'z':
+	    global.version = 6;
+	    res = 0;
+	    break;
+
+	case 'C':
+	    global.do_cgi = 1;
+	    break;
+
 	case 'v':
 	    if (val)
 		global.verbose = atoi(val);
@@ -798,14 +836,16 @@ int args_callback_option(char *arg, char *val)
     return res;
 }
 
-struct options_t options[] = 
-{ 
-{"o", "output"},
+static struct options_t options[] = {
 {"r", "rate"},
+{"o", "output"},
+{"z", "zlib"},
+{"X", "pixel"},
+{"Y", "pixel"},
 {"v", "verbose"},
-{"X", "width"},
-{"Y", "height"},
+{"C", "cgi"},
 {"V", "version"},
+{0,0}
 };
 
 int args_callback_longoption(char *name, char *val)
@@ -834,16 +874,20 @@ int args_callback_command(char *arg, char *next)	// actually used as filename
 
 void args_callback_usage(char *name)
 {
-    printf("Usage: %s  [-options [value]] imagefiles[.png] [...]\n", name);
-    printf("-r framerate          (rate) Set movie framerate (100/sec)\n");
-    printf("-o outputfile         (output) Set name for SWF output file\n");
-    printf("-X pixel              (width) Force movie width to pixel (default: autodetect)\n");
-    printf("-Y pixel              (height) Force movie height to pixel (default: autodetect)\n");
-    printf("-v level              (verbose) Set verbose level (0=quiet, 1=default, 2=debug)\n");
-    printf("-V                    (version) Print version information and exit\n");
+    printf("\n");
+    printf("Usage: %s [-X width] [-Y height] [-o file.swf] [-r rate] file1.png [file2.png...]\n", name);
+    printf("\n");
+    printf("-r , --rate <framerate>        Set movie framerate (frames per second)\n");
+    printf("-o , --output <filename>       Set name for SWF output file.\n");
+    printf("-z , --zlib <zlib>             Enable Flash 6 (MX) Zlib Compression\n");
+    printf("-X , --pixel <width>           Force movie width to <width> (default: autodetect)\n");
+    printf("-Y , --pixel <height>          Force movie height to <height> (default: autodetect)\n");
+    printf("-v , --verbose <level>         Set verbose level (0=quiet, 1=default, 2=debug)\n");
+    printf("-C , --cgi                     For use as CGI- prepend http header, write to stdout\n");
+    printf("-V , --version                 Print version information and exit\n");
+    printf("\n");
 }
 
-
 int main(int argc, char **argv)
 {
     SWF swf;
@@ -851,13 +895,16 @@ int main(int argc, char **argv)
 
     memset(&global, 0x00, sizeof(global));
 
-    global.framerate = 100;
+    global.framerate = 1.0;
     global.verbose = 1;
+    global.version = 4;
 
     processargs(argc, argv);
-
-    if(global.nfiles<=0)
+    
+    if(global.nfiles<=0) {
+	fprintf(stderr, "No png files found in arguments\n");
 	return 1;
+    }
 
     if (VERBOSE(2))
 	fprintf(stderr, "Processing %i file(s)...\n", global.nfiles);