char* swf_GetString(TAG*t)
{
- char* str = ((char*)(&(t)->data[(t)->pos]));
- while(swf_GetU8(t));
- return str;
+ int pos = t->pos;
+ while(t->pos < t->len && swf_GetU8(t));
+ /* make sure we always have a trailing zero byte */
+ if(t->pos == t->len) {
+ if(t->len == t->memsize) {
+ swf_ResetWriteBits(t);
+ swf_SetU8(t, 0);
+ t->len = t->pos;
+ }
+ t->data[t->len] = 0;
+ }
+ return (char*)&(t->data[pos]);
}
U8 swf_GetU8(TAG * t)
return (S32)res;
}
-U32 reader_GetBits(struct reader_t*reader, int nbits)
+U32 reader_GetBits(reader_t*reader, int nbits)
{ return reader_readbits(reader, nbits);
}
-S32 reader_GetSBits(struct reader_t*reader, int nbits)
+S32 reader_GetSBits(reader_t*reader, int nbits)
{ U32 res = reader_readbits(reader, nbits);
if (res&(1<<(nbits-1))) res|=(0xffffffff<<nbits);
return (S32)res;
// Advanced Data Access Functions
+double swf_GetFixed(TAG * t)
+{
+ U16 low = swf_GetU16(t);
+ U16 high = swf_GetU16(t);
+ return high + low*(1/65536.0);
+}
+void swf_SetFixed(TAG * t, double f)
+{
+ swf_SetU16(t, (U16)((f-(int)f)*65536));
+ swf_SetU16(t, (U16)f);
+}
+float swf_GetFixed8(TAG * t)
+{
+ U8 low = swf_GetU8(t);
+ U8 high = swf_GetU8(t);
+ return high + low*(1/256.0);
+}
+void swf_SetFixed8(TAG * t, float f)
+{
+ swf_SetU8(t, (U8)((f-(int)f)*256));
+ swf_SetU8(t, (U8)f);
+}
+
int swf_SetRGB(TAG * t,RGBA * col)
{ if (!t) return -1;
if (col)
memset(gradient, 0, sizeof(GRADIENT));
return;
}
- if(!gradient)
- gradient = &dummy;
- gradient->num = swf_GetU8(tag);
- for(t=0;t<gradient->num;t++)
+ U8 num = swf_GetU8(tag) & 15;
+ if(gradient) {
+ gradient->num = num;
+ gradient->rgba = rfx_calloc(sizeof(RGBA)*gradient->num);
+ gradient->ratios = rfx_calloc(sizeof(gradient->ratios[0])*gradient->num);
+ }
+ for(t=0;t<num;t++)
{
- int s=t;
- if(s>=8) //FIXME
- s=7;
- gradient->ratios[t] = swf_GetU8(tag);
+ U8 ratio = swf_GetU8(tag);
+ RGBA color;
if(!alpha)
- swf_GetRGB(tag, &gradient->rgba[t]);
+ swf_GetRGB(tag, &color);
else
- swf_GetRGBA(tag, &gradient->rgba[t]);
+ swf_GetRGBA(tag, &color);
+ if(gradient) {
+ gradient->ratios[t] = ratio;
+ gradient->rgba[t] = color;
+ }
}
}
}
}
+void swf_FreeGradient(GRADIENT* gradient)
+{
+ if(gradient->ratios)
+ rfx_free(gradient->ratios);
+ if(gradient->rgba)
+ rfx_free(gradient->rgba);
+ memset(gradient, 0, sizeof(GRADIENT));
+}
+
int swf_CountUBits(U32 v,int nbits)
{ int n = 32;
U32 m = 0x80000000;
return 0;
}
-int reader_GetRect(struct reader_t*reader,SRECT * r)
+int reader_GetRect(reader_t*reader,SRECT * r)
{ int nbits;
SRECT dummy;
if (!r) r = &dummy;
return 0;
}
-TAG * swf_ReadTag(struct reader_t*reader, TAG * prev)
+TAG * swf_ReadTag(reader_t*reader, TAG * prev)
{ TAG * t;
U16 raw;
U32 len;
int swf_DefineSprite_GetRealSize(TAG * t);
-int swf_WriteTag2(struct writer_t*writer, TAG * t)
+int swf_WriteTag2(writer_t*writer, TAG * t)
// returns tag length in bytes (incl. Header), -1 = Error
// writer = 0 -> no output
{ U16 raw[3];
len = (t->id==ST_DEFINESPRITE)?swf_DefineSprite_GetRealSize(t):t->len;
- short_tag = len<0x3f&&(t->id!=ST_DEFINEBITSLOSSLESS&&t->id!=ST_DEFINEBITSLOSSLESS2);
+ short_tag = len<0x3f&&
+ (t->id!=ST_DEFINEBITSLOSSLESS&&t->id!=ST_DEFINEBITSLOSSLESS2&&t->id!=ST_SOUNDSTREAMBLOCK&&
+ t->id!=ST_DEFINEBITSJPEG&&t->id!=ST_DEFINEBITSJPEG2&&t->id!=ST_DEFINEBITSJPEG3);
if (writer)
{ if (short_tag)
int swf_WriteTag(int handle, TAG * t)
{
- struct writer_t writer;
+ writer_t writer;
int len = 0;
if(handle<0)
return swf_WriteTag2(0, t);
do
{
- if(t->len<0x3f&&t->id!=ST_DEFINEBITSLOSSLESS&&t->id!=ST_DEFINEBITSLOSSLESS2) {
+ if(t->len<0x3f&&
+ (t->id!=ST_DEFINEBITSLOSSLESS&&t->id!=ST_DEFINEBITSLOSSLESS2&&t->id!=ST_SOUNDSTREAMBLOCK&&
+ t->id!=ST_DEFINEBITSJPEG&&t->id!=ST_DEFINEBITSJPEG2&&t->id!=ST_DEFINEBITSJPEG3)
+ ) {
swf_SetU16(sprtag,t->len|(t->id<<6));
} else {
swf_SetU16(sprtag,0x3f|(t->id<<6));
// Movie Functions
-int swf_ReadSWF2(struct reader_t*reader, SWF * swf) // Reads SWF to memory (malloc'ed), returns length or <0 if fails
+int swf_ReadSWF2(reader_t*reader, SWF * swf) // Reads SWF to memory (malloc'ed), returns length or <0 if fails
{
if (!swf) return -1;
memset(swf,0x00,sizeof(SWF));
int len;
TAG * t;
TAG t1;
- struct reader_t zreader;
+ reader_t zreader;
if ((len = reader->read(reader ,b,8))<8) return -1;
int swf_ReadSWF(int handle, SWF * swf)
{
- struct reader_t reader;
+ reader_t reader;
reader_init_filereader(&reader, handle);
return swf_ReadSWF2(&reader, swf);
}
-int swf_WriteSWF2(struct writer_t*writer, SWF * swf) // Writes SWF to file, returns length or <0 if fails
+int swf_WriteSWF2(writer_t*writer, SWF * swf) // Writes SWF to file, returns length or <0 if fails
{ U32 len;
TAG * t;
int frameCount=0;
- struct writer_t zwriter;
+ writer_t zwriter;
int fileSize = 0;
int inSprite = 0;
int writer_lastpos = 0;
if(writer) writer_lastpos = writer->pos;
+ if(swf->fileVersion >= 8) {
+ if ((swf->firstTag && swf->firstTag->id != ST_FILEATTRIBUTES) &&
+ (!swf->firstTag->next || swf->firstTag->next->id != ST_FILEATTRIBUTES))
+ {
+ U32 flags = 0; // | 128 = usenetwork, | 8 = hasmetadata
+ swf_SetU32(swf_InsertTagBefore(swf, swf->firstTag,ST_FILEATTRIBUTES),flags);
+ }
+ }
+
// Insert REFLEX Tag
#ifdef INSERT_RFX_TAG
int swf_WriteSWF(int handle, SWF * swf) // Writes SWF to file, returns length or <0 if fails
{
- struct writer_t writer;
+ writer_t writer;
int len = 0;
swf->compressed = 0;
int swf_WriteSWC(int handle, SWF * swf) // Writes SWF to file, returns length or <0 if fails
{
- struct writer_t writer;
+ writer_t writer;
int len = 0;
swf->compressed = 1;
return len;
}
-int swf_WriteHeader2(struct writer_t*writer,SWF * swf)
+int swf_WriteHeader2(writer_t*writer,SWF * swf)
{
SWF myswf;
memcpy(&myswf,swf,sizeof(SWF));
#include "modules/swfsound.c"
#include "modules/swfdraw.c"
#include "modules/swfrender.c"
+#include "modules/swffilter.c"