X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Frfxswf.c;h=93f5db5d2d287b3faa34083ed9093c271b1caa9d;hb=8d26cc0baf8f7d05e72bc7b8e5f1a6f7caa9f158;hp=b6062c5f0b5afae8ee8a8e13ff71d1518b7235c4;hpb=f37b0cbc930fb3d9907044f24471d57c9f68dd43;p=swftools.git diff --git a/lib/rfxswf.c b/lib/rfxswf.c index b6062c5..93f5db5 100644 --- a/lib/rfxswf.c +++ b/lib/rfxswf.c @@ -46,6 +46,7 @@ #include "./bitio.h" #include "./MD5.h" +#include "./os.h" // internal constants @@ -94,7 +95,6 @@ U8 swf_GetU8(TAG * t) #ifdef DEBUG_RFXSWF if (t->pos>=t->len) { fprintf(stderr,"GetU8() out of bounds: TagID = %i\n",t->id); - *(int*)0=0; return 0; } #endif @@ -278,7 +278,8 @@ void swf_SetFixed8(TAG * t, float f) swf_SetU8(t, fr); swf_SetU8(t, (U8)f - (f<0 && fr!=0)); } -int swf_GetU30(TAG*tag) + +U32 swf_GetU30(TAG*tag) { U32 shift = 0; U32 s = 0; @@ -293,10 +294,72 @@ int swf_GetU30(TAG*tag) } /*int nr2= swf_SetU30(0, s); if(nr!=nr2) { - printf("Signed value %d stored in %d bytes, I'd store it in %d bytes\n", s, nr, nr2); + printf("Unsigned value %d stored in %d bytes, I'd store it in %d bytes\n", s, nr, nr2); }*/ return s; } + +int swf_SetU30(TAG*tag, U32 u) +{ + int nr = 0; + do { + if(tag) + swf_SetU8(tag, (u&~0x7f?0x80:0) | (u&0x7F)); + u>>=7; + nr++; + } while(u); + return nr; +} + +void swf_SetABCU32(TAG*tag, U32 u) +{ + do { + swf_SetU8(tag, (u&~0x7f?0x80:0) | (u&0x7F)); + u>>=7; + } while(u); +} +U32 swf_GetABCU32(TAG*tag) +{ + return swf_GetU30(tag); +} +void swf_SetABCS32(TAG*tag, S32 v) +{ + swf_SetABCU32(tag, v); +} +S32 swf_GetABCS32(TAG*tag) +{ + return swf_GetABCU32(tag); +} + +#if 0 + +/*The AVM2 spec is just plain wrong, claiming that S32 values are sign +extended. They're not. +This wastes up to 4 bytes for every negative value. */ + +void swf_SetABCS32(TAG*tag, S32 s) +{ + printf("write S32: %d\n", s); + S32 neg = s<0?-1:0; + U8 sign = s<0?0x40:0; + while(1) { + U8 val = s&0x7f; + U8 vsign = s&0x40; + s>>=7; + neg>>=7; + if(s==neg && vsign==sign) { + /* if the value we now write has the same sign as s + and all the remaining bits are equal to the sign of s + too, stop writing */ + swf_SetU8(tag, val); + printf("put %02x\n", val); + break; + } else { + swf_SetU8(tag, 0x80 | val); + printf("put %02x\n", 0x80|val); + } + }; +} int swf_GetS30(TAG*tag) { U32 shift = 0; @@ -309,7 +372,8 @@ int swf_GetS30(TAG*tag) shift+=7; if(!(b&128) || shift>=32) { if(b&64) { - s|=0xffffffff<>=7; - neg>>=7; - if(s==neg && vsign==sign) { - /* if the value we just wrote has the same sign as s - and all the remaining bits are equal to the sign of s - too, stop writing */ - if(tag) - swf_SetU8(tag, val); - nr++; - break; - } else { - if(tag) - swf_SetU8(tag, 0x80 | val); - nr++; - } - }; - return nr; +#endif -} -int swf_SetU30(TAG*tag, U32 u) +int swf_SetU30String(TAG*tag, const char*str, int l) { - if(u&0x80000000) { - fprintf(stderr, "Bit 31 set in U30 value"); - u&=0x7fffffff; - } - int nr = 0; - do { - if(tag) - swf_SetU8(tag, (u&~0x7f?0x80:0) | (u&0x7F)); - u>>=7; - nr++; - } while(u); - return nr; -} -int swf_SetU30String(TAG*tag, const char*str) -{ - int l = strlen(str); int len=0; len+=swf_SetU30(tag, l); len+=l; @@ -1452,6 +1475,19 @@ int swf_ReadSWF2(reader_t*reader, SWF * swf) // Reads SWF to memory (malloc'ed return reader->pos; } +SWF* swf_OpenSWF(char*filename) +{ + int fi = open(filename, O_RDONLY|O_BINARY); + if(fi<0) { + fprintf(stderr, "Failed to open %s\n", filename); + return 0; + } + SWF* swf = rfx_alloc(sizeof(SWF)); + swf_ReadSWF(fi, swf); + close(fi); + return swf; +} + int swf_ReadSWF(int handle, SWF * swf) { reader_t reader; @@ -1459,6 +1495,17 @@ int swf_ReadSWF(int handle, SWF * swf) return swf_ReadSWF2(&reader, swf); } +void swf_ReadABCfile(char*filename, SWF*swf) +{ + memset(swf, 0, sizeof(SWF)); + swf->fileVersion=9; + swf->fileAttributes=FILEATTRIBUTE_AS3; //as3 + TAG*tag = swf->firstTag = swf_InsertTag(0, ST_RAWABC); + memfile_t*file = memfile_open(filename); + swf_SetBlock(tag, file->data, file->len); + memfile_close(file); +} + int no_extra_tags = 0; int WriteExtraTags(SWF*swf, writer_t*writer) @@ -1489,9 +1536,9 @@ int WriteExtraTags(SWF*swf, writer_t*writer) if(swf->fileVersion >= 9) { if(!has_fileattributes) { - U32 flags = swf->fileAttributes|0x08; // 16 = has symbolclass tag | 8 = actionscript3 | 1 = usenetwork + U32 flags = swf->fileAttributes|FILEATTRIBUTE_AS3; // 16 = has symbolclass tag | 8 = actionscript3 | 1 = usenetwork if(has_version_8_action && !has_version_9_action) - flags &= ~0x08; + flags &= ~FILEATTRIBUTE_AS3; TAG*fileattrib = swf_InsertTag(0, ST_FILEATTRIBUTES); swf_SetU32(fileattrib, flags); if(writer) { @@ -1505,7 +1552,7 @@ int WriteExtraTags(SWF*swf, writer_t*writer) if(swf_WriteTag2(writer, has_fileattributes)<0) return -1; } - if(!has_scenedescription) { + if(0 && !has_scenedescription) { TAG*scene = swf_InsertTag(0, ST_SCENEDESCRIPTION); swf_SetU16(scene, 1); swf_SetString(scene, (U8*)"Scene 1"); @@ -1544,7 +1591,9 @@ int swf_WriteSWF2(writer_t*writer, SWF * swf) // Writes SWF to file, return t = swf->firstTag; frameCount = 0; - len += WriteExtraTags(swf, 0); + if(swf->firstTag && !no_extra_tags) { + len += WriteExtraTags(swf, 0); + } while(t) { len += swf_WriteTag(-1,t); if(t->id == ST_DEFINESPRITE && !swf_IsFolded(t)) inSprite++; @@ -1626,7 +1675,7 @@ int swf_WriteSWF2(writer_t*writer, SWF * swf) // Writes SWF to file, return return -1; } - if(!no_extra_tags) { + if(swf->firstTag && !no_extra_tags) { WriteExtraTags(swf, writer); } t = swf->firstTag;