X-Git-Url: http://git.asbjorn.biz/?p=swftools.git;a=blobdiff_plain;f=src%2Fpng2swf.c;h=05366fca6d07229805695b3cb237ad64fecdc7dc;hp=e033e93d5437b902d1c8146f0fce50b53b4b0289;hb=f29d8006b1d8253c50808d6eb4941bdeb808c601;hpb=18a26d55cce0b899106edb796bad0df32de8259f diff --git a/src/png2swf.c b/src/png2swf.c index e033e93..05366fc 100644 --- a/src/png2swf.c +++ b/src/png2swf.c @@ -26,6 +26,7 @@ #include #include "../lib/rfxswf.h" #include "../lib/args.h" +#include "../lib/png.h" #define MAX_INPUT_FILES 1024 #define VERBOSE(x) (global.verbose>=x) @@ -39,13 +40,22 @@ struct { int nfiles; int verbose; int do_cgi; + int version; char *outfile; + int mkjpeg; + float scale; } global; struct { char *filename; } image[MAX_INPUT_FILES]; +static int custom_move=0; +static int move_x=0; +static int move_y=0; +static int clip_x1=0,clip_y1=0,clip_x2=0,clip_y2=0; +static int custom_clip = 0; + TAG *MovieStart(SWF * swf, float framerate, int dx, int dy) { TAG *t; @@ -53,15 +63,22 @@ TAG *MovieStart(SWF * swf, float framerate, int dx, int dy) memset(swf, 0x00, sizeof(SWF)); - swf->fileVersion = 5; + swf->fileVersion = global.version; swf->frameRate = (int)(256.0 * framerate); - swf->movieSize.xmax = dx * 20; - swf->movieSize.ymax = dy * 20; + if(custom_clip) { + swf->movieSize.xmin = clip_x1 * 20; + swf->movieSize.ymin = clip_y1 * 20; + swf->movieSize.xmax = clip_x2 * 20; + swf->movieSize.ymax = clip_y2 * 20; + } else { + 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; @@ -83,7 +100,8 @@ int MovieFinish(SWF * swf, TAG * t, char *sname) 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 (swf_WriteSWF(f, swf)<0) + fprintf(stderr, "Unable to write output file: %s\n", sname); if (f != so) close(f); } @@ -101,7 +119,7 @@ int png_read_chunk(char (*head)[4], int*destlen, U8**destdata, FILE*fi) return 0; if(!fread(head, 4, 1, fi)) return 0; - len = REVERSESWAP32(len); + len = BE_32_TO_NATIVE(len); if(destlen) *destlen = len; if(destdata) { if(len) @@ -125,7 +143,7 @@ unsigned int png_get_dword(FILE*fi) { unsigned int a; fread(&a,4,1,fi); - return REVERSESWAP32(a); + return BE_32_TO_NATIVE(a); } struct png_header @@ -145,7 +163,7 @@ int png_read_header(FILE*fi, struct png_header*header) U8 head2[8]; U8*data; fread(head2,8,1,fi); - if(strncmp(head,head2,4)) + if(strncmp((char*)head,(char*)head2,4)) return 0; while(png_read_chunk(&id, &len, &data, fi)) @@ -155,10 +173,10 @@ int png_read_header(FILE*fi, struct png_header*header) if(!strncasecmp(id, "IHDR", 4)) { char a,b,c,f,i; if(len < 8) exit(1); - header->width = REVERSESWAP32(*(U32*)&data[0]); - header->height = REVERSESWAP32(*(U32*)&data[4]); + header->width = BE_32_TO_NATIVE(*(U32*)&data[0]); + header->height = BE_32_TO_NATIVE(*(U32*)&data[4]); a = data[8]; // should be 8 - b = data[9]; // should be 3(indexed) or 2(rgb) + b = data[9]; // should be 3(indexed), 2(rgb), 0(grayscale) or 6(truecolor+alpha) c = data[10]; // compression mode (0) f = data[11]; // filter mode (0) @@ -179,7 +197,7 @@ int png_read_header(FILE*fi, struct png_header*header) exit(1); } if(a!=8 && (b==2 || b==6)) { - fprintf(stderr, "Bpp %d in mode %d not supported!\n", a); + fprintf(stderr, "Bpp %d in mode %d not supported!\n", b, a); exit(1); } if(c!=0) { @@ -299,7 +317,6 @@ void applyfilter3(int mode, U8*src, U8*old, U8*dest, int width) src+=3; } } - } void applyfilter4(int mode, U8*src, U8*old, U8*dest, int width) @@ -308,11 +325,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;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) { - - fprintf(stderr, "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; @@ -619,24 +665,40 @@ TAG *MovieAddFrame(SWF * swf, TAG * t, char *sname, int id) rgba[i].b = palette[i*3+2]; if(alphapalette && i>header.bpp); + palettelen = 1< No jpeg support compiled in"); + } +#endif + if(global.mkjpeg) { +#ifdef HAVE_JPEGLIB + RGBA*data = 0; + getPNG(sname, &width, &height, (unsigned char**)&data); + if(!data) + exit(1); + if(swf_ImageHasAlpha(data, width, height)) { + t = swf_InsertTag(t, ST_DEFINEBITSJPEG3); + swf_SetU16(t, id); + swf_SetJPEGBits3(t, width,height,data,global.mkjpeg); + } else { + t = swf_InsertTag(t, ST_DEFINEBITSJPEG2); + swf_SetU16(t, id); + swf_SetJPEGBits2(t, width,height,data,global.mkjpeg); + } +#endif + } else if(1) { + RGBA*data = 0; + getPNG(sname, &width, &height, (unsigned char**)&data); + if(!data) + exit(1); + t = swf_InsertTag(t, ST_DEFINEBITSLOSSLESS); + swf_SetU16(t, id); + swf_SetLosslessImage(t, data,width,height); + } else { + /* old code: transform PNG encoding 1:1 to SWF */ + t = PNG2Image(t, id, sname, &width, &height); + } t = swf_InsertTag(t, ST_DEFINESHAPE3); swf_ShapeNew(&s); swf_GetMatrix(NULL, &m); - m.sx = 20 * 0x10000; - m.sy = 20 * 0x10000; - fs = swf_ShapeAddBitmapFillStyle(s, &m, id, 0); + m.sx = (int)(20 * 0x10000); + m.sy = (int)(20 * 0x10000); + m.tx = 0; + m.ty = 0; + fs = swf_ShapeAddBitmapFillStyle(s, &m, id, 1); swf_SetU16(t, id + 1); // id r.xmin = r.ymin = 0; - r.xmax = header.width * 20; - r.ymax = header.height * 20; + r.xmax = width * 20; + r.ymax = height * 20; swf_SetRect(t, &r); swf_SetShapeHeader(t, s); @@ -708,14 +819,20 @@ TAG *MovieAddFrame(SWF * swf, TAG * t, char *sname, int id) t = swf_InsertTag(t, ST_PLACEOBJECT2); swf_GetMatrix(NULL, &m); - m.tx = (swf->movieSize.xmax - (int) header.width * 20) / 2; - m.ty = (swf->movieSize.ymax - (int) header.height * 20) / 2; + m.sx = (int)(0x10000 * global.scale); + m.sy = (int)(0x10000 * global.scale); + + if(custom_move) { + m.tx = move_x*20; + m.ty = move_y*20; + } else { + m.tx = (swf->movieSize.xmax - (int) (width * global.scale * 20)) / 2; + m.ty = (swf->movieSize.ymax - (int) (height * global.scale * 20)) / 2; + } swf_ObjectPlace(t, id + 1, 50, &m, NULL, NULL); t = swf_InsertTag(t, ST_SHOWFRAME); - fclose(fi); - return t; } @@ -739,9 +856,10 @@ int CheckInputFile(char *fname, char **realname) sprintf(s, "%s.PNG", fname); if ((fi = fopen(s, "rb")) == NULL) { sprintf(s, "%s.Png", fname); - if ((fi = fopen(s, "rb")) == NULL) + if ((fi = fopen(s, "rb")) == NULL) { fprintf(stderr, "Couldn't open %s!\n", fname); return -1; + } } } } @@ -771,7 +889,9 @@ int args_callback_option(char *arg, char *val) case 'r': if (val) global.framerate = atof(val); - if ((global.framerate < 1.0/256) ||(global.framerate >= 256.0)) { + /* removed framerate>0 restriction in order to make + Flash Communication Server compatible SWFs */ + if ((global.framerate < 0) ||(global.framerate >= 256.0)) { if (VERBOSE(1)) fprintf(stderr, "Error: You must specify a valid framerate between 1/256 and 255.\n"); @@ -786,14 +906,41 @@ int args_callback_option(char *arg, char *val) res = 1; break; + case 's': + global.scale = atof(val)/100; + res = 1; + break; + + case 'z': + if(global.version<6) + global.version = 6; + res = 0; + break; + + case 'j': + global.mkjpeg = atoi(val); + res = 1; + break; + + case 'T': + global.version = atoi(val); + res = 1; + break; + case 'C': global.do_cgi = 1; break; case 'v': - if (val) - global.verbose = atoi(val); - res = 1; + global.verbose++; + res = 0; + break; + + case 'q': + global.verbose--; + if(global.verbose<0) + global.verbose = 0; + res = 0; break; case 'X': @@ -807,10 +954,48 @@ int args_callback_option(char *arg, char *val) global.force_height = atoi(val); res = 1; break; - + case 'V': printf("png2swf - part of %s %s\n", PACKAGE, VERSION); exit(0); + + case 'c': { + char*s = strdup(val); + char*x1 = strtok(s, ":"); + char*y1 = strtok(0, ":"); + char*x2 = strtok(0, ":"); + char*y2 = strtok(0, ":"); + if(!(x1 && y1 && x2 && y2)) { + fprintf(stderr, "-m option requires four arguments, :::\n"); + exit(1); + } + custom_clip = 1; + clip_x1 = atoi(x1); + clip_y1 = atoi(y1); + clip_x2 = atoi(x2); + clip_y2 = atoi(y2); + free(s); + + res = 1; + break; + } + + case 'm': { + char*s = strdup(val); + char*c = strchr(s, ':'); + if(!c) { + fprintf(stderr, "-m option requires two arguments, :\n"); + exit(1); + } + *c = 0; + custom_move = 1; + move_x = atoi(val); + move_y = atoi(c+1); + free(s); + + res = 1; + break; + } default: res = -1; @@ -826,16 +1011,19 @@ 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"}, -{"C", "cgi"}, +{"o", "output"}, +{"j", "jpeg"}, +{"z", "zlib"}, +{"T", "flashversion"}, +{"X", "pixel"}, +{"Y", "pixel"}, {"v", "verbose"}, -{"X", "width"}, -{"Y", "height"}, +{"q", "quiet"}, +{"C", "cgi"}, {"V", "version"}, +{"s", "scale"}, {0,0} }; @@ -865,14 +1053,22 @@ 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("\t-r , --rate \t\t\tSet movie framerate (frames per second)\n"); - printf("\t-o , --output \t\t\tSet name for SWF output file\n"); - printf("\t-X , --pixel \t\t\tForce movie width to pixel (default: autodetect)\n"); - printf("\t-Y , --pixel \t\t\tForce movie height to pixel (default: autodetect)\n"); - printf("\t-v , --verbose \t\t\t Set verbose level (0=quiet, 1=default, 2=debug)\n"); - printf("\t-C , --cgi\t\t\t For use as CGI- prepend http header, write to stdout\n"); - printf("\t-V , --version\t\t\tPrint 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("-j , --jpeg Generate a lossy jpeg bitmap inside the SWF, with a given quality (1-100)\n"); + printf("-z , --zlib Enable Flash 6 (MX) Zlib Compression\n"); + printf("-T , --flashversion Set the flash version to generate\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("-q , --quiet Omit normal log messages, only log errors\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("-s , --scale Scale image to %% size.\n"); + printf("\n"); } int main(int argc, char **argv) @@ -884,20 +1080,22 @@ int main(int argc, char **argv) global.framerate = 1.0; global.verbose = 1; + global.version = 8; + global.scale = 1.0; 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); t = MovieStart(&swf, global.framerate, - global.force_width ? global.force_width : global. - max_image_width, - global.force_height ? global.force_height : global. - max_image_height); + global.force_width ? global.force_width : (int)(global.max_image_width*global.scale), + global.force_height ? global.force_height : (int)(global.max_image_height*global.scale)); { int i;