X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fpng2swf.c;h=6d4fd77c1f13e3a51c69d17957912be0117fa5e2;hb=3520d107a8da451695f0c8d8684cd7706fa3b662;hp=c1bee8524d6953835a9810ba9c1e908e1b6ab8ed;hpb=8fe2515728e298d539da814d81b02cdb2a466df5;p=swftools.git diff --git a/src/png2swf.c b/src/png2swf.c index c1bee85..6d4fd77 100644 --- a/src/png2swf.c +++ b/src/png2swf.c @@ -31,13 +31,14 @@ #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; char *outfile; } global; @@ -45,7 +46,7 @@ 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; @@ -53,14 +54,14 @@ TAG *MovieStart(SWF * swf, int framerate, int dx, int dy) memset(swf, 0x00, sizeof(SWF)); swf->fileVersion = 5; - swf->frameRate = (25600 / framerate); + 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 +69,24 @@ 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 FAILED(swf_WriteSWF(f,swf)) fprintf(stderr,"WriteSWF() failed.\n"); + 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; @@ -351,6 +355,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]; @@ -413,6 +418,7 @@ void applyfilter1(int mode, U8*src, U8*old, U8*dest, int width) else if(mode==3) { for(x=0;x32 bit conversion */ + unsigned char* firstline = malloc(header.width*4); + for(y=0;yid = 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 if(header.mode == 0 || header.mode == 3) { RGBA*rgba; @@ -615,13 +620,9 @@ TAG *MovieAddFrame(SWF * swf, TAG * t, char *sname, int id) rgba[i].b = palette[i*3+2]; if(alphapalette && i 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; @@ -782,6 +783,10 @@ int args_callback_option(char *arg, char *val) res = 1; break; + case 'C': + global.do_cgi = 1; + break; + case 'v': if (val) global.verbose = atoi(val); @@ -818,14 +823,13 @@ int args_callback_option(char *arg, char *val) return res; } -struct options_t options[] = -{ -{"h", "help"}, -{"o", "output"}, +static struct options_t options[] = { {"r", "rate"}, +{"o", "output"}, +{"X", "pixel"}, +{"Y", "pixel"}, {"v", "verbose"}, -{"X", "width"}, -{"Y", "height"}, +{"C", "cgi"}, {"V", "version"}, {0,0} }; @@ -856,16 +860,19 @@ 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 Set movie framerate (frames per second)\n"); + printf("-o , --output Set name for SWF output file.\n"); + printf("-X , --pixel Force movie width to (default: autodetect)\n"); + printf("-Y , --pixel Force movie height to (default: autodetect)\n"); + printf("-v , --verbose 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; @@ -873,7 +880,7 @@ int main(int argc, char **argv) memset(&global, 0x00, sizeof(global)); - global.framerate = 100; + global.framerate = 1.0; global.verbose = 1; processargs(argc, argv);