X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Frfxswf.h;h=673429a46be63a61b087250a5c96421a156c50b4;hb=ccdef17af6b95031cf3b2c093f1594b635adbfdb;hp=2dc338d134b4902de4a9e892a278ed162e51061f;hpb=469e1e998167801f48345b52b98d8bcb282b9f53;p=swftools.git

diff --git a/lib/rfxswf.h b/lib/rfxswf.h
index 2dc338d..673429a 100644
--- a/lib/rfxswf.h
+++ b/lib/rfxswf.h
@@ -38,6 +38,7 @@ extern "C" {
 
 /* 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))
@@ -79,6 +80,11 @@ typedef struct _RGBA
   U8    b;
 } RGBA, * LPRGBA;
 
+typedef struct _YUV
+{
+  U8	y,u,v;
+} YUV;
+
 typedef struct _SRECT
 { SCOORD        xmin;
   SCOORD        ymin;
@@ -130,7 +136,7 @@ typedef struct _TAG             // NEVER access a Tag-Struct directly !
 typedef struct _SOUNDINFO 
 {
     U8 stop;
-    U8 multiple; //continue playing if already started
+    U8 nomultiple; //continue playing if already started
 
     U32 inpoint;
     U32 outpoint;
@@ -187,10 +193,12 @@ void swf_OptimizeTagOrder(SWF*swf);
 // basic routines:
     
 TAG * swf_InsertTag(TAG * after,U16 id);    // updates frames, if necessary
+TAG * swf_InsertTagBefore(SWF*swf, TAG * before,U16 id);     // like InsertTag, but insert tag before argument
 int   swf_DeleteTag(TAG * t);
 
 void  swf_ClearTag(TAG * t);                //frees tag data
-
+void  swf_ResetTag(TAG*tag, U16 id);        //set's tag position and length to 0, without freeing it
+    
 void  swf_SetTagPos(TAG * t,U32 pos);       // resets Bitcount
 U32   swf_GetTagPos(TAG * t);
 
@@ -330,10 +338,11 @@ typedef struct _LINESTYLE
 } LINESTYLE, * LPLINESTYLE;
 
 typedef struct _FILLSTYLE
-{ U8     type;
-  RGBA   color;
-  MATRIX         m; 
-  U16    id_bitmap;
+{ U8	    type;
+  RGBA	    color;
+  MATRIX    m; 
+  U16	    id_bitmap;
+  GRADIENT* gradient;
 } FILLSTYLE, * LPFILLSTYLE;
      
 typedef struct _SHAPE           // NEVER access a Shape-Struct directly !
@@ -407,11 +416,13 @@ int   swf_ShapeSetCurve(TAG * t,SHAPE * s,S32 x,S32 y,S32 ax,S32 ay);
 int   swf_ShapeSetCircle(TAG * t,SHAPE * s,S32 x,S32 y,S32 rx,S32 ry);
 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);
 SHAPE2*	   swf_ShapeToShape2(SHAPE*shape);
-SHAPE*	   swf_Shape2ToShape(SHAPE2*shape);
-SRECT	   swf_GetShapeBoundingBox(SHAPELINE*shape);
-int	   swf_SetShape2(TAG*tag, SHAPE2*shape);
+void	   swf_Shape2ToShape(SHAPE2*shape2, SHAPE*shape);
+SRECT	   swf_GetShapeBoundingBox(SHAPE2*shape);
+void	    swf_SetShape2(TAG*tag, SHAPE2*shape);
 void	   swf_Shape2Free(SHAPE2 * s);
 
 // swffont.c
@@ -653,7 +664,7 @@ int swf_SetLosslessBitsGrayscale(TAG * t,U16 width,U16 height,U8 * bitmap);
 
 // swfsound.c
 void swf_SetSoundStreamHead(TAG*tag, int avgnumsamples);
-void swf_SetSoundStreamBlock(TAG*tag, S16*samples, char first); /* expects 2304 samples */
+void swf_SetSoundStreamBlock(TAG*tag, S16*samples, int seek, char first); /* expects 2304 samples */
 
 void swf_SetSoundDefine(TAG*tag, S16*samples, int num);
 
@@ -833,6 +844,33 @@ void swf_SetPlaceObject(TAG * t,SWFPLACEOBJECT* obj);
 void swf_GetPlaceObject(TAG * t,SWFPLACEOBJECT* obj);
 void swf_PlaceObjectFree(SWFPLACEOBJECT* obj);
 
+// swfvideo.c
+
+typedef struct _VIDEOSTREAM
+{
+    int width;
+    int height;
+    int owidth;
+    int oheight;
+    int frame;
+    int linex;
+    int olinex;
+    YUV*oldpic;
+    YUV*current;
+    int bbx,bby;
+    int*mvdx;
+    int*mvdy;
+
+    /* modifyable: */
+    int do_motion; //enable motion compensation (slow!)
+
+} VIDEOSTREAM;
+
+void swf_SetVideoStreamDefine(TAG*tag, VIDEOSTREAM*stream, U16 frames, U16 width, U16 height);
+void swf_SetVideoStreamIFrame(TAG*tag, VIDEOSTREAM*s, RGBA*pic, int quant/* 1-31, 1=best quality, 31=best compression*/);
+void swf_SetVideoStreamPFrame(TAG*tag, VIDEOSTREAM*s, RGBA*pic, int quant/* 1-31, 1=best quality, 31=best compression*/);
+void swf_VideoStreamClear(VIDEOSTREAM*stream);
+
 #ifdef __cplusplus
 }
 #endif