X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fmodules%2Fswfbits.c;h=a1110e3f984da76e5b59a979660ccc2da724b820;hb=4466cccb28955a0d145a5ef1534d56109497e40b;hp=da8be390f22423292615b059b883a3b693e0cf74;hpb=5fad380fbef965c12e904e79d0e8071c44c53ef4;p=swftools.git diff --git a/lib/modules/swfbits.c b/lib/modules/swfbits.c index da8be39..a1110e3 100644 --- a/lib/modules/swfbits.c +++ b/lib/modules/swfbits.c @@ -13,7 +13,7 @@ #define OUTBUFFER_SIZE 0x8000 -#ifdef _JPEGLIB_INCLUDED_ +#ifdef HAVE_JPEGLIB typedef struct _JPEGDESTMGR { struct jpeg_destination_mgr mgr; @@ -25,29 +25,29 @@ typedef struct _JPEGDESTMGR // Destination manager callbacks -void swf_init_destination(j_compress_ptr cinfo) +void RFXSWF_init_destination(j_compress_ptr cinfo) { JPEGDESTMGR * dmgr = (JPEGDESTMGR *)cinfo->dest; dmgr->buffer = (JOCTET*)malloc(OUTBUFFER_SIZE); dmgr->mgr.next_output_byte = dmgr->buffer; dmgr->mgr.free_in_buffer = OUTBUFFER_SIZE; } -boolean swf_empty_output_buffer(j_compress_ptr cinfo) +boolean RFXSWF_empty_output_buffer(j_compress_ptr cinfo) { JPEGDESTMGR * dmgr = (JPEGDESTMGR *)cinfo->dest; - SetBlock(dmgr->t,(U8*)dmgr->buffer,OUTBUFFER_SIZE); + swf_SetBlock(dmgr->t,(U8*)dmgr->buffer,OUTBUFFER_SIZE); dmgr->mgr.next_output_byte = dmgr->buffer; dmgr->mgr.free_in_buffer = OUTBUFFER_SIZE; return TRUE; } -void swf_term_destination(j_compress_ptr cinfo) +void RFXSWF_term_destination(j_compress_ptr cinfo) { JPEGDESTMGR * dmgr = (JPEGDESTMGR *)cinfo->dest; - SetBlock(dmgr->t,(U8*)dmgr->buffer,OUTBUFFER_SIZE-dmgr->mgr.free_in_buffer); + swf_SetBlock(dmgr->t,(U8*)dmgr->buffer,OUTBUFFER_SIZE-dmgr->mgr.free_in_buffer); free(dmgr->buffer); dmgr->mgr.free_in_buffer = 0; } -JPEGBITS * SetJPEGBitsStart(TAG * t,int width,int height,int quality) +JPEGBITS * swf_SetJPEGBitsStart(TAG * t,int width,int height,int quality) { JPEGDESTMGR * jpeg; @@ -61,9 +61,9 @@ JPEGBITS * SetJPEGBitsStart(TAG * t,int width,int height,int quality) jpeg_create_compress(&jpeg->cinfo); - jpeg->mgr.init_destination = swf_init_destination; - jpeg->mgr.empty_output_buffer = swf_empty_output_buffer; - jpeg->mgr.term_destination = swf_term_destination; + jpeg->mgr.init_destination = RFXSWF_init_destination; + jpeg->mgr.empty_output_buffer = RFXSWF_empty_output_buffer; + jpeg->mgr.term_destination = RFXSWF_term_destination; jpeg->t = t; @@ -91,18 +91,18 @@ JPEGBITS * SetJPEGBitsStart(TAG * t,int width,int height,int quality) return (JPEGBITS *)jpeg; } -int SetJPEGBitsLines(JPEGBITS * jpegbits,U8 ** data,int n) +int swf_SetJPEGBitsLines(JPEGBITS * jpegbits,U8 ** data,int n) { JPEGDESTMGR * jpeg = (JPEGDESTMGR *)jpegbits; if (!jpeg) return -1; jpeg_write_scanlines(&jpeg->cinfo,data,n); return 0; } -int SetJPEGBitsLine(JPEGBITS * jpegbits,U8 * data) -{ return SetJPEGBitsLines(jpegbits,&data,1); +int swf_SetJPEGBitsLine(JPEGBITS * jpegbits,U8 * data) +{ return swf_SetJPEGBitsLines(jpegbits,&data,1); } -int SetJPEGBitsFinish(JPEGBITS * jpegbits) +int swf_SetJPEGBitsFinish(JPEGBITS * jpegbits) { JPEGDESTMGR * jpeg = (JPEGDESTMGR *)jpegbits; if (!jpeg) return -1; jpeg_finish_compress(&jpeg->cinfo); @@ -110,7 +110,25 @@ int SetJPEGBitsFinish(JPEGBITS * jpegbits) return 0; } -int SetJPEGBits(TAG * t,char * fname,int quality) +void swf_SetJPEGBits2(TAG * tag,U16 width,U16 height,RGBA* bitmap, int quality) +{ + JPEGBITS* jpeg; + int y; + jpeg = swf_SetJPEGBitsStart(tag,width,height,quality); + for (y=0;y=0;x--) { + js[x*3] = js[x*3+1] = js[x*3+2] = js[x]; + } + swf_SetJPEGBitsLines(out,(U8**)&js,1); + } + } + else if(cinfo.out_color_space == JCS_RGB) + { + for (y=0;y>8); + js[x*3+1] = y - ((88*(u-128)-183*(v-128))>>8); + js[x*3+2] = y + ((455 * (u-128))>>8); + } + } + } + else if(cinfo.out_color_space == JCS_CMYK) + { + for (y=0;yRGB conversion routines I found in the + web. (which all produced garbage) + I'm happily accepting suggestions. (mk)*/ + for(x=0;x>8); + js[x*3+1] = white - ((js[x*4+1]*white)>>8); + js[x*3+2] = white - ((js[x*4+2]*white)>>8); + } + swf_SetJPEGBitsLines(out,(U8**)&js,1); + } } } - SetJPEGBitsFinish(out); + swf_SetJPEGBitsFinish(out); jpeg_finish_decompress(&cinfo); fclose(f); return 0; } -#endif // _JPEGLIB_INCLUDED_ +#endif // HAVE_JPEGLIB // Lossless compression texture based on zlib -#ifdef _ZLIB_INCLUDED_ +#ifdef HAVE_ZLIB -int swf_deflate_wraper(TAG * t,z_stream * zs,U8 * data,boolean finish) -{ while (1) - { int status = deflate(zs,Z_SYNC_FLUSH); +int RFXSWF_deflate_wraper(TAG * t,z_stream * zs,boolean finish) +{ + U8*data=malloc(OUTBUFFER_SIZE); + zs->next_out = data; + zs->avail_out = OUTBUFFER_SIZE; + while (1) + { int status = deflate(zs,Z_NO_FLUSH); + + if (status!=Z_OK) + { +#ifdef DEBUG_RFXSWF + fprintf(stderr,"rfxswf: zlib compression error (%i)\n",status); +#endif + free(data); + return status; + } - if (zs->avail_out == 0) - { SetBlock(t,data,zs->next_out-data); + if (zs->next_out!=data) + { swf_SetBlock(t,data,zs->next_out - data); zs->next_out = data; zs->avail_out = OUTBUFFER_SIZE; } if (zs->avail_in==0) - { if (finish) deflate(zs,Z_FINISH); break; - } + } - if (status!=Z_OK) + if(!finish) { + free(data); + return 0; + } + + while(1) { + int status = deflate(zs,Z_FINISH); + if (status!=Z_OK && status!=Z_STREAM_END) { #ifdef DEBUG_RFXSWF fprintf(stderr,"rfxswf: zlib compression error (%i)\n",status); #endif + free(data); return status; } + if (zs->next_out!=data) + { + swf_SetBlock(t,data,zs->next_out - data); + zs->next_out = data; + zs->avail_out = OUTBUFFER_SIZE; + } + + if(status == Z_STREAM_END) + break; } + free(data); return 0; } -int SetLosslessBits(TAG * t,U16 width,U16 height,void * bitmap,U8 bitmap_flags) + +int swf_SetLosslessBits(TAG * t,U16 width,U16 height,void * bitmap,U8 bitmap_flags) { int res = 0; int bps; - U8 * data; switch (bitmap_flags) { case BMF_8BIT: - return SetLosslessBitsIndexed(t,width,height,bitmap,NULL,256); + return swf_SetLosslessBitsIndexed(t,width,height,bitmap,NULL,256); case BMF_16BIT: bps = BYTES_PER_SCANLINE(sizeof(U16)*width); break; @@ -194,14 +297,14 @@ int SetLosslessBits(TAG * t,U16 width,U16 height,void * bitmap,U8 bitmap_flags) bps = width*4; break; default: + fprintf(stderr, "rfxswf: unknown bitmap type %d\n", bitmap_flags); return -1; } - - SetU8(t,bitmap_flags); - SetU16(t,width); - SetU16(t,height); - if (data=malloc(OUTBUFFER_SIZE)) + swf_SetU8(t,bitmap_flags); + swf_SetU16(t,width); + swf_SetU16(t,height); + { z_stream zs; memset(&zs,0x00,sizeof(z_stream)); @@ -211,23 +314,28 @@ int SetLosslessBits(TAG * t,U16 width,U16 height,void * bitmap,U8 bitmap_flags) if (deflateInit(&zs,Z_DEFAULT_COMPRESSION)==Z_OK) { zs.avail_in = bps*height; zs.next_in = bitmap; - zs.next_out = data; - zs.avail_out = OUTBUFFER_SIZE; - - if (swf_deflate_wraper(t,&zs,data,TRUE)<0) res = -3; - if (zs.next_out>data) SetBlock(t,data,zs.next_out-data); + if (RFXSWF_deflate_wraper(t,&zs,TRUE)<0) res = -3; deflateEnd(&zs); - } else res = -3; // zlib error - free(data); - } else res = -2; // memory error + } + + while(t->len < 64) { /* actually, 63 and above is o.k., but let's stay on the safe side */ + + /* Flash players up to MX crash or do strange things if they encounter a + DefineLossless Tag with a payload of less than 63 bytes. They also + substitute the whole bitmap by a red rectangle. + + This loop fills up the tag with zeroes so that this doesn't happen. + */ + swf_SetU8(t, 0); + } return res; } -int SetLosslessBitsIndexed(TAG * t,U16 width,U16 height,U8 * bitmap,RGBA * palette,U16 ncolors) +int swf_SetLosslessBitsIndexed(TAG * t,U16 width,U16 height,U8 * bitmap,RGBA * palette,U16 ncolors) { RGBA * pal = palette; int bps = BYTES_PER_SCANLINE(width); U8 * data; @@ -240,14 +348,16 @@ int SetLosslessBitsIndexed(TAG * t,U16 width,U16 height,U8 * bitmap,RGBA * palet ncolors = 256; } - if ((ncolors<2)||(ncolors>256)||(!t)) return -1; // parameter error + if ((ncolors<2)||(ncolors>256)||(!t)) { + fprintf(stderr, "rfxswf: unsupported number of colors: %d\n", ncolors); + return -1; // parameter error + } - SetU8(t,BMF_8BIT); - SetU16(t,width); - SetU16(t,height); - SetU8(t,ncolors-1); // number of pal entries + swf_SetU8(t,BMF_8BIT); + swf_SetU16(t,width); + swf_SetU16(t,height); + swf_SetU8(t,ncolors-1); // number of pal entries - if (data=malloc(OUTBUFFER_SIZE)) { z_stream zs; memset(&zs,0x00,sizeof(z_stream)); @@ -256,7 +366,7 @@ int SetLosslessBitsIndexed(TAG * t,U16 width,U16 height,U8 * bitmap,RGBA * palet if (deflateInit(&zs,Z_DEFAULT_COMPRESSION)==Z_OK) { U8 * zpal; // compress palette - if (zpal = malloc(ncolors*4)) + if ((zpal = malloc(ncolors*4))) { U8 * pp = zpal; int i; @@ -271,7 +381,7 @@ int SetLosslessBitsIndexed(TAG * t,U16 width,U16 height,U8 * bitmap,RGBA * palet alpha values different from 0 and 0xff in lossless bitmaps... */ - if (GetTagID(t)==ST_DEFINEBITSLOSSLESS2) // have alpha channel? + if (swf_GetTagID(t)==ST_DEFINEBITSLOSSLESS2) // have alpha channel? { for (i=0;idata) SetBlock(t,data,zs.next_out-data); + if (zs.next_out>data) swf_SetBlock(t,data,zs.next_out-data); free(zpal); } else res = -2; // memory error } else res = -3; // zlib error free(data); - } else res = -2; + } if (!palette) free(pal); return res; } -int SetLosslessBitsGrayscale(TAG * t,U16 width,U16 height,U8 * bitmap) -{ return SetLosslessBitsIndexed(t,width,height,bitmap,NULL,256); +int swf_SetLosslessBitsGrayscale(TAG * t,U16 width,U16 height,U8 * bitmap) +{ return swf_SetLosslessBitsIndexed(t,width,height,bitmap,NULL,256); } -#endif // _ZLIB_INCLUDED_ +#endif // HAVE_ZLIB -#undef OUTBUFFER_SIZE +#if defined(HAVE_ZLIB) && defined(HAVE_JPEGLIB) +int swf_SetJPEGBits3(TAG * tag,U16 width,U16 height,RGBA* bitmap, int quality) +{ + JPEGBITS* jpeg; + int y; + int pos; + int res = 0; + U8 * data; + z_stream zs; + + pos = tag->len; + swf_SetU32(tag, 0); //placeholder + jpeg = swf_SetJPEGBitsStart(tag,width,height,quality); + for (y=0;ydata[pos], tag->len - pos - 4); + + data=malloc(OUTBUFFER_SIZE); + memset(&zs,0x00,sizeof(z_stream)); + + if (deflateInit(&zs,Z_DEFAULT_COMPRESSION)!=Z_OK) { + fprintf(stderr, "rfxswf: zlib compression failed"); + return -3; + } + + zs.next_out = data; + zs.avail_out = OUTBUFFER_SIZE; + + for (y=0;y