X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Frfxswf.h;h=6e15da0f91fc1ad92b0c1f2862e08a4594690a16;hb=801496a591772aabee79893d09972d9bc0e50206;hp=6fb8a8de4ad2d7dfa17f34d964b7bebebb9ff07b;hpb=077c474d859547ebe1cdc40c4efeeae3e779ea93;p=swftools.git diff --git a/lib/rfxswf.h b/lib/rfxswf.h index 6fb8a8d..6e15da0 100644 --- a/lib/rfxswf.h +++ b/lib/rfxswf.h @@ -30,6 +30,7 @@ extern "C" { #include #include +#include #include #include #include @@ -37,54 +38,14 @@ extern "C" { #include "../config.h" #include "./bitio.h" #include "./drawer.h" +#include "./mem.h" +#include "./types.h" #define DEBUG_RFXSWF #ifdef RFXSWF_DISABLESOUND #define NO_MP3 #endif -#ifndef TRUE -#define TRUE (1) -#endif -#ifndef FALSE -#define FALSE (0) -#endif - - -/* little/big endian stuff */ - -#define PUT8(ptr,x) {((U8*)(ptr))[0]=x;} -#define PUT16(ptr,x) {((U8*)(ptr))[0]=(U8)(x);((U8*)(ptr))[1]=(U8)((x)>>8);} -#define PUT32(ptr,x) {((U8*)(ptr))[0]=(U8)(x);((U8*)(ptr))[1]=(U8)((x)>>8);((U8*)(ptr))[2]=(U8)((x)>>16);((U8*)(ptr))[3]=(U8)((x)>>24);} -#define GET16(ptr) (((U16)(((U8*)(ptr))[0]))+(((U16)(((U8*)(ptr))[1]))<<8)) -#define GET32(ptr) (((U16)(((U8*)(ptr))[0]))+(((U16)(((U8*)(ptr))[1]))<<8)+(((U16)(((U8*)(ptr))[2]))<<16)+(((U16)(((U8*)(ptr))[3]))<<24)) - -#ifdef WORDS_BIGENDIAN -#define SWAP16(s) ((((s)>>8)&0x00ff)|(((s)<<8)&0xff00)) -#define SWAP32(s) (SWAP16(((s)>>16)&0x0000ffff)|((SWAP16(s)<<16)&0xffff0000)) -#define REVERSESWAP16(x) (x) -#define REVERSESWAP32(x) (x) -#else -#define SWAP16(x) (x) -#define SWAP32(x) (x) -#define REVERSESWAP16(s) ((((s)>>8)&0x00ff)|(((s)<<8)&0xff00)) -#define REVERSESWAP32(s) (REVERSESWAP16(((s)>>16)&0x0000ffff)|((REVERSESWAP16(s)<<16)&0xffff0000)) -#endif - -#define ALLOC_ARRAY(type, num) (((type)*)rfxalloc(sizeof(type)*(num))) -void* rfx_alloc(int size); -void* rfx_calloc(int size); -void* rfx_realloc(void*data, int size); -void rfx_free(void*data); - -// SWF Types - -typedef unsigned long U32; -typedef signed long S32; -typedef unsigned short U16; -typedef signed short S16; -typedef unsigned char U8; -typedef signed char S8; typedef signed long SFIXED; typedef signed long SCOORD; @@ -96,14 +57,14 @@ typedef signed long SCOORD; typedef struct _SPOINT { SCOORD x; SCOORD y; -} SPOINT, * LPSPOINT; +} SPOINT; typedef struct _RGBA { U8 a; U8 r; U8 g; U8 b; -} RGBA, * LPRGBA; +} RGBA; typedef struct _YUV { @@ -115,23 +76,19 @@ typedef struct _SRECT SCOORD ymin; SCOORD xmax; SCOORD ymax; -} SRECT, * LPSRECT; +} SRECT; typedef struct _MATRIX -{ SFIXED sx; // factor x - SFIXED sy; - SFIXED r0; // rotation - SFIXED r1; - SCOORD tx; // delta x - SCOORD ty; -} MATRIX, * LPMATRIX; +{ SFIXED sx,r1, tx; + SFIXED r0,sy, ty; +} MATRIX; typedef struct _CXFORM { S16 a0, a1; /* mult, add */ S16 r0, r1; S16 g0, g1; S16 b0, b1; -} CXFORM, * LPCXFORM; +} CXFORM; #define GRADIENT_LINEAR 0x10 #define GRADIENT_RADIAL 0x12 @@ -142,6 +99,16 @@ typedef struct _GRADIENT RGBA rgba[8]; } GRADIENT; +typedef struct _FILTER +{ + U8 type; +} FILTER; +typedef struct _FILTERLIST +{ + int num; + FILTER*filter; +} FILTERLIST; + typedef struct _TAG // NEVER access a Tag-Struct directly ! { U16 id; U8 * data; @@ -156,7 +123,7 @@ typedef struct _TAG // NEVER access a Tag-Struct directly ! U8 readBit; // for Bit-Manipulating Functions [read] U8 writeBit; // [write] -} TAG, * LPTAG; +} TAG; #define swf_ResetReadBits(tag) if (tag->readBit) { tag->pos++; tag->readBit = 0; } #define swf_ResetWriteBits(tag) if (tag->writeBit) { tag->writeBit = 0; } @@ -186,25 +153,26 @@ typedef struct _SWF U16 frameRate; U16 frameCount; // valid after load and save TAG * firstTag; -} SWF, * LPSWF; +} SWF; // Basic Functions -int swf_ReadSWF2(struct reader_t*reader, SWF * swf); // Reads SWF via callback +int swf_ReadSWF2(reader_t*reader, SWF * swf); // Reads SWF via callback int swf_ReadSWF(int handle,SWF * swf); // Reads SWF to memory (malloc'ed), returns length or <0 if fails -int swf_WriteSWF2(struct writer_t*writer, SWF * swf); // Writes SWF via callback, returns length or <0 if fails +int swf_WriteSWF2(writer_t*writer, SWF * swf); // Writes SWF via callback, returns length or <0 if fails int swf_WriteSWF(int handle,SWF * swf); // Writes SWF to file, returns length or <0 if fails int swf_WriteSWC(int handle, SWF * swf); // for convenience, equal to swf->compressed=1;swf_WriteSWF(..) int swf_WriteCGI(SWF * swf); // Outputs SWF with valid CGI header to stdout void swf_FreeTags(SWF * swf); // Frees all malloc'ed memory for swf +SWF* swf_CopySWF(SWF*swf); // for streaming: int swf_WriteHeader(int handle,SWF * swf); // Writes Header of swf to file -int swf_WriteHeader2(struct writer_t*writer,SWF * swf); // Writes Header of swf to file +int swf_WriteHeader2(writer_t*writer,SWF * swf); // Writes Header of swf to file int swf_WriteTag(int handle,TAG * tag); // Writes TAG to file -int swf_WriteTag2(struct writer_t*writer, TAG * t); //Write TAG via callback +int swf_WriteTag2(writer_t*writer, TAG * t); //Write TAG via callback -int swf_ReadHeader(struct reader_t*reader, SWF * swf); // Reads SWF Header via callback +int swf_ReadHeader(reader_t*reader, SWF * swf); // Reads SWF Header via callback // folding/unfolding: @@ -342,8 +310,18 @@ SRECT swf_TurnRect(SRECT r, MATRIX* m); #define ST_VIDEOFRAME 61 #define ST_DEFINEFONTINFO2 62 #define ST_MX4 63 /*(?) */ +#define ST_ENABLEDEBUGGER2 64 /* version 8 */ #define ST_SCRIPTLIMITS 65 /* version 7- u16 maxrecursedepth, u16 scripttimeoutseconds */ #define ST_SETTABINDEX 66 /* version 7- u16 depth(!), u16 tab order value */ +#define ST_FILEATTRIBUTES 69 /* version 8 (required)- */ +#define ST_PLACEOBJECT3 70 /* version 8 */ +#define ST_IMPORTASSETS2 71 /* version 8 */ +#define ST_DEFINEFONTALIGNZONES 73 /* version 8 */ +#define ST_CSMTEXTSETTINGS 74 /* version 8 */ +#define ST_DEFINEFONT3 75 /* version 8 */ +#define ST_METADATA 77 /* version 8 */ +#define ST_DEFINESCALINGGRID 78 /* version 8 */ +#define ST_DEFINESHAPE4 83 /* version 8 */ /* custom tags- only valid for swftools */ #define ST_REFLEX 777 /* to identify generator software */ @@ -356,7 +334,7 @@ SRECT swf_TurnRect(SRECT r, MATRIX* m); typedef struct _LINESTYLE { U16 width; RGBA color; -} LINESTYLE, * LPLINESTYLE; +} LINESTYLE; #define FILL_SOLID 0x00 #define FILL_LINEAR 0x10 // Gradient @@ -370,7 +348,7 @@ typedef struct _FILLSTYLE MATRIX m; U16 id_bitmap; GRADIENT gradient; -} FILLSTYLE, * LPFILLSTYLE; +} FILLSTYLE; typedef struct _SHAPE // NEVER access a Shape-Struct directly ! { @@ -391,7 +369,7 @@ typedef struct _SHAPE // NEVER access a Shape-Struct directly ! // used by Get/SetSimpleShape and glyph handling U8 * data; U32 bitlen; // length of data in bits -} SHAPE, * LPSHAPE; +} SHAPE; /* SHAPE can be converted into SHAPE2: */ @@ -429,6 +407,7 @@ int swf_ShapeAddLineStyle(SHAPE * s,U16 width,RGBA * color); int swf_ShapeAddSolidFillStyle(SHAPE * s,RGBA * color); int swf_ShapeAddBitmapFillStyle(SHAPE * s,MATRIX * m,U16 id_bitmap,int clip); int swf_ShapeAddGradientFillStyle(SHAPE * s,MATRIX * m,GRADIENT* gradient,int radial); +int swf_ShapeAddFillStyle2(SHAPE * s,FILLSTYLE*fs); int swf_SetShapeStyles(TAG * t,SHAPE * s); int swf_ShapeCountBits(SHAPE * s,U8 * fbits,U8 * lbits); @@ -437,6 +416,7 @@ int swf_SetShapeHeader(TAG * t,SHAPE * s); // one call for upper three functio int swf_ShapeSetMove(TAG * t,SHAPE * s,S32 x,S32 y); int swf_ShapeSetStyle(TAG * t,SHAPE * s,int line,int fill0,int fill1); +#define UNDEFINED_COORD 0x7fffffff int swf_ShapeSetAll(TAG * t,SHAPE * s,S32 x,S32 y,int line,int fill0,int fill1); int swf_ShapeSetLine(TAG * t,SHAPE * s,S32 x,S32 y); @@ -446,18 +426,21 @@ int swf_ShapeSetEnd(TAG * t); void swf_ShapeSetBitmapRect(TAG * t, U16 gfxid, int width, int height); -SHAPELINE* swf_ParseShapeData(U8*data, int bits, int fillbits, int linebits); +//SHAPELINE* swf_ParseShapeData(U8*data, int bits, int fillbits, int linebits); SHAPE2* swf_ShapeToShape2(SHAPE*shape); void swf_Shape2ToShape(SHAPE2*shape2, SHAPE*shape); SRECT swf_GetShapeBoundingBox(SHAPE2*shape); void swf_SetShape2(TAG*tag, SHAPE2*shape); +SHAPE2* swf_Shape2Clone(SHAPE2 * s); void swf_Shape2Free(SHAPE2 * s); void swf_DumpShape(SHAPE2*shape2); void swf_ParseDefineShape(TAG*tag, SHAPE2*shape); -void swf_Shape2ToShape(SHAPE2*shape2, SHAPE*shape); void swf_SetShape2(TAG*tag, SHAPE2*shape2); +void swf_RecodeShapeData(U8*data, int bitlen, int in_bits_fill, int in_bits_line, + U8**destdata, U32*destbitlen, int out_bits_fill, int out_bits_line); + // swfdraw.c void swf_Shape10DrawerInit(drawer_t*draw, TAG*tag); @@ -484,7 +467,7 @@ typedef struct _SWFLAYOUT SRECT * bounds; U16 kerningcount; SWFKERNING * kerning; -} SWFLAYOUT, * LPSWFLAYOUT; +} SWFLAYOUT; typedef struct { S16 advance; @@ -494,7 +477,8 @@ typedef struct typedef struct _FONTUSAGE { int* chars; char is_reduced; -} FONTUSAGE, * LPFONTUSAGE; + int used_glyphs; +} FONTUSAGE; #define FONT_STYLE_BOLD 1 #define FONT_STYLE_ITALIC 2 @@ -521,7 +505,7 @@ typedef struct _SWFFONT FONTUSAGE * use; -} SWFFONT, * LPSWFFONT; +} SWFFONT; #define ET_HASTEXT 32768 @@ -541,6 +525,11 @@ typedef struct _SWFFONT #define ET_HTML 2 /* MX? */ #define ET_USEOUTLINES 1 +#define ET_ALIGN_LEFT 0 +#define ET_ALIGN_RIGHT 1 +#define ET_ALIGN_CENTER 2 +#define ET_ALIGN_JUSTIFY 3 + typedef struct _EditTextLayout { U8 align; // 0=left, 1=right, 2=center, 3=justify @@ -550,7 +539,7 @@ typedef struct _EditTextLayout U16 leading; } EditTextLayout; -int swf_FontEnumerate(SWF * swf,void (*FontCallback) (U16,U8*)); +int swf_FontEnumerate(SWF * swf,void (*FontCallback) (void*,U16,U8*), void*self); // -> void fontcallback(U16 id,U8 * name); returns number of defined fonts int swf_FontExtract(SWF * swf,int id,SWFFONT ** f); @@ -694,12 +683,14 @@ int swf_ButtonPostProcess(TAG * t,int anz_action); // Set all offsets in DefineB // swfbits.c -typedef int JPEGBITS,* LPJPEGBITS; // cover libjpeg structures +int swf_ImageHasAlpha(RGBA*img, int width, int height); +int swf_ImageGetNumberOfPaletteEntries(RGBA*img, int width, int height, RGBA*palette); -JPEGBITS * swf_SetJPEGBitsStart(TAG * t,int width,int height,int quality); -int swf_SetJPEGBitsLines(JPEGBITS * jpegbits,U8 ** data,int n); -int swf_SetJPEGBitsLine(JPEGBITS * jpegbits,U8 * data); -int swf_SetJPEGBitsFinish(JPEGBITS * jpegbits); +typedef int JPEGBITS; +JPEGBITS * swf_SetJPEGBitsStart(TAG * t,int width,int height,int quality); // deprecated +int swf_SetJPEGBitsLines(JPEGBITS * jpegbits,U8 ** data,int n); // deprecated +int swf_SetJPEGBitsLine(JPEGBITS * jpegbits,U8 * data); // deprecated +int swf_SetJPEGBitsFinish(JPEGBITS * jpegbits); // deprecated void swf_GetJPEGSize(char * fname, int*width, int*height); @@ -707,6 +698,9 @@ int swf_SetJPEGBits(TAG * t,char * fname,int quality); void swf_SetJPEGBits2(TAG * t,U16 width,U16 height,RGBA * bitmap,int quality); int swf_SetJPEGBits3(TAG * tag,U16 width,U16 height,RGBA* bitmap, int quality); RGBA* swf_JPEG2TagToImage(TAG*tag, int*width, int*height); +void swf_RemoveJPEGTables(SWF*swf); + +void swf_SaveJPEG(char*filename, RGBA*pixels, int width, int height, int quality); #define BYTES_PER_SCANLINE(width) ((width+3)&0xfffffffc) @@ -717,14 +711,22 @@ RGBA* swf_JPEG2TagToImage(TAG*tag, int*width, int*height); int swf_SetLosslessBits(TAG * t,U16 width,U16 height,void * bitmap,U8 bitmap_flags); int swf_SetLosslessBitsIndexed(TAG * t,U16 width,U16 height,U8 * bitmap,RGBA * palette,U16 ncolors); int swf_SetLosslessBitsGrayscale(TAG * t,U16 width,U16 height,U8 * bitmap); +void swf_SetLosslessImage(TAG*tag, RGBA*data, int width, int height); //WARNING: will change tag->id + RGBA* swf_DefineLosslessBitsTagToImage(TAG*tag, int*width, int*height); RGBA* swf_ExtractImage(TAG*tag, int*dwidth, int*dheight); +RGBA* swf_ImageScale(RGBA*data, int width, int height, int newwidth, int newheight); +TAG* swf_AddImage(TAG*tag, int bitid, RGBA*mem, int width, int height, int quality); // swfsound.c void swf_SetSoundStreamHead(TAG*tag, int avgnumsamples); void swf_SetSoundStreamBlock(TAG*tag, S16*samples, int seek, char first); /* expects 2304 samples */ void swf_SetSoundDefine(TAG*tag, S16*samples, int num); +void swf_SetSoundDefineMP3(TAG*tag, U8* data, unsigned length, + unsigned SampRate, + unsigned Channels, + unsigned NumFrames); void swf_SetSoundInfo(TAG*tag, SOUNDINFO*info); // swftools.c @@ -735,9 +737,14 @@ U8 swf_isPseudoDefiningTag(TAG * t); U8 swf_isAllowedSpriteTag(TAG * t); U8 swf_isImageTag(TAG*tag); U8 swf_isShapeTag(TAG*tag); +U8 swf_isTextTag(TAG*tag); +U8 swf_isFontTag(TAG*tag); +U8 swf_isPlaceTag(TAG*tag); U16 swf_GetDefineID(TAG * t); SRECT swf_GetDefineBBox(TAG * t); +void swf_SetDefineBBox(TAG * t, SRECT r); + void swf_SetDefineID(TAG * t, U16 newid); U16 swf_GetPlaceID(TAG * t); //PLACEOBJECT, PLACEOBJECT2 (sometimes), REMOVEOBJECT int swf_GetDepth(TAG * t); //PLACEOBJECT,PLACEOBJECT2,REMOVEOBJECT,REMOVEOBJECT2,SETTABINDEX @@ -752,6 +759,8 @@ void swf_RelocateDepth(SWF*swf, char*bitmap); // bitmap is 65536 bytes, bitmap[d TAG* swf_Concatenate (TAG*list1,TAG*list2); // warning: both list1 and list2 are invalid after this call. +RGBA swf_GetSWFBackgroundColor(SWF*swf); + // swfcgi.c void swf_uncgi(); // same behaviour as Steven Grimm's uncgi-library @@ -767,7 +776,7 @@ typedef struct _ActionTAG struct _ActionTAG * prev; struct _ActionTAG * parent; - U8 tmp[4]; // store small operands here. + U8 tmp[8]; // store small operands here. } ActionTAG; typedef struct _ActionMarker @@ -889,8 +898,11 @@ void action_fixjump(ActionMarker m1, ActionMarker m2); // The following 3 routines only use placeobject2: +extern char*blendModeNames[]; + int swf_ObjectPlace(TAG * t,U16 id,U16 depth,MATRIX * m,CXFORM * cx,U8 * name); int swf_ObjectPlaceClip(TAG * t,U16 id,U16 depth,MATRIX * m,CXFORM * cx,U8 * name, U16 clipaction); +int swf_ObjectPlaceBlend(TAG * t,U16 id,U16 depth,MATRIX * m,CXFORM * cx,U8 * name, U8 blendmode); int swf_ObjectMove(TAG * t,U16 depth,MATRIX * m,CXFORM * cx); typedef struct _SWFPLACEOBJECT { @@ -903,6 +915,8 @@ typedef struct _SWFPLACEOBJECT { U8*name; U16 clipdepth; ActionTAG* actions; + U8 blendmode; + FILTERLIST*filters; } SWFPLACEOBJECT; void swf_SetPlaceObject(TAG * t,SWFPLACEOBJECT* obj); @@ -952,9 +966,12 @@ typedef struct RENDERBUF void*internal; } RENDERBUF; -void swf_Render_Init(RENDERBUF*buf, int posx, int posy, int width, int height); +void swf_Render_Init(RENDERBUF*buf, int posx, int posy, int width, int height, int antialize, int multiply); +void swf_Render_SetBackground(RENDERBUF*buf, RGBA*img, int width, int height); +void swf_Render_SetBackgroundColor(RENDERBUF*buf, RGBA color); RGBA* swf_Render(RENDERBUF*dest); -void swf_RenderShape(RENDERBUF*dest, SHAPE2*shape, MATRIX*m, CXFORM*c, int depth,int clipdepth); +void swf_RenderShape(RENDERBUF*dest, SHAPE2*shape, MATRIX*m, CXFORM*c, U16 depth,U16 clipdepth); +void swf_RenderSWF(RENDERBUF*buf, SWF*swf); void swf_Render_AddImage(RENDERBUF*buf, U16 id, RGBA*img, int width, int height); void swf_Render_ClearCanvas(RENDERBUF*dest); void swf_Render_Delete(RENDERBUF*dest);