Changeset 1027

Timestamp:

02/19/09 01:29:04 (1 year ago)

Author:

astrange

Message:

Color conversions:
- Simplify API and move bits out of FFusion
- Fix up & enable SSE2 Y420toY422 asm; compiled code surrounding it is still awful

Build system:
- Fix problems with Xcode GUI vs xcodebuild finding different SVN paths
- Don't revert/repatch ffmpeg unless it's actually being built
- Update cflags for Perian itself
- Remove some patches that aren't needed anymore
- Turn off more h264 decoder features we don't use

Subtitles:
- Push font weights through the parser (not supported in rendering yet)
- Drop shapes in the parser (a hack but too difficult in the renderer)
- More correct font sizes for \fn & \fs tags
- Slightly faster font lookup

Maybe some more too

Files:

• trunk/ColorConversions.c (modified) (13 diffs)
• trunk/ColorConversions.h (modified) (1 diff)
• trunk/CommonUtils.c (modified) (1 diff)
• trunk/CommonUtils.h (modified) (1 diff)
• trunk/FFusionCodec.c (modified) (4 diffs)
• trunk/Patches/ffmpeg-h264dsp-crash.diff (deleted)
• trunk/Patches/ffmpeg-no-interlaced.diff (modified) (2 diffs)
• trunk/Patches/ffmpeg-pic.diff (deleted)
• trunk/Perian.xcodeproj/project.pbxproj (modified) (3 diffs)
• trunk/Subtitles/SubATSUIRenderer.m (modified) (12 diffs)
• trunk/Subtitles/SubContext.h (modified) (1 diff)
• trunk/Subtitles/SubContext.m (modified) (4 diffs)
• trunk/Subtitles/SubParsing.h (modified) (1 diff)
• trunk/Subtitles/SubParsing.m.rl (modified) (7 diffs)
• trunk/Subtitles/SubRenderer.h (modified) (1 diff)
• trunk/createStaticLibs.sh (modified) (3 diffs)

trunk/ColorConversions.c

@@ -16 +16 @@
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; if not, write to the Free Software
- */
-
-
+
+
+
-#include <QuickTime/QuickTime.h>
-#include <Accelerate/Accelerate.h>
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-#define unlikely(x) __builtin_expect(x, 0)
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-        /*From Docs: PixMap baseAddr points to a big-endian PlanarPixmapInfoYUV420 struct; see ImageCodec.i. */
-    planar = (PlanarPixmapInfoYUV420 *) baseAddr;
-    
-    // if ya can't set da poiners, set da offsets
-=
-
-
+ =  
+ 
+ 
-    
-    // for the 16/32 add look at EDGE in mpegvideo.c
-
+ 
-    planar->componentInfoCb.rowBytes = EndianU32_NtoB(picture->linesize[1]);
-    planar->componentInfoCr.rowBytes = EndianU32_NtoB(picture->linesize[2]);
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-        for(x=0; x < halfWidth; x++)
-        {
-
+
+
-                o[x4] = uc[x];
-                o[x4+1] = yc[x2];
@@ -82 +72 @@
-#define HandleLastRow(o, yc, uc, vc, halfWidth, height) if (unlikely(height & 1)) Y420toY422_lastrow(o, yc, uc, vc, halfWidth)
-
-
+
+
+
+
-//hand-unrolled code is a bad idea on modern CPUs. luckily, this does not run on modern CPUs, only G3s.
-
-
-
-
-
-
+
+
+
+
+
-         UInt8          *inY = picture->data[0], *inU = picture->data[1], *inV = picture->data[2];
-         int             rB = picture->linesize[0], rbU = picture->linesize[1], rbV = picture->linesize[2];
@@ -129 +121 @@
-        
-        HandleLastRow(baseAddr, inY, inU, inV, halfWidth, height);
- 
-
-void Y420toY422_ppc_altivec(UInt8 * o, unsigned outRB, unsigned width, unsigned height, AVFrame * picture
+
+
+FASTCALL void Y420toY422_ppc_altivec(AVFrame * picture, UInt8 * o, int outRB, unsigned width, unsigned height
-{
-        UInt8                   *yc = picture->data[0], *uc = picture->data[1], *vc = picture->data[2];
@@ -182 +174 @@
-        HandleLastRow(o, yc, uc, vc, width / 2, height);
-}
-
-void Y420toY422(UInt8 * o, unsigned outRB, unsigned width, unsigned height, AVFrame * picture)
-{
-        static void (*y420_function)(UInt8* baseAddr, unsigned outRB, unsigned width, unsigned height, AVFrame * picture) = NULL;
-        if (!y420_function) {
-                int sels[2] = { CTL_HW, HW_VECTORUNIT }; // from http://developer.apple.com/hardwaredrivers/ve/g3_compatibility.html
-                int vType = 0; //0 == scalar only
-                size_t length = sizeof(vType);
-                int error = sysctl(sels, 2, &vType, &length, NULL, 0);
-                if( 0 == error && vType ) y420_function = Y420toY422_ppc_altivec;
-                else 
-                y420_function = Y420toY422_ppc_scalar;
-        }
-        
-        y420_function(o, outRB, width, height, picture);
-}
-#else
-#include <emmintrin.h>
-
-void Y420toY422_sse2(UInt8 *  o, unsigned outRB, unsigned width, unsigned height, AVFrame * picture
+FASTCALL void Y420toY422_sse2(AVFrame * picture, UInt8 *o, int outRB, unsigned width, unsigned height
-{
-        UInt8   *yc = picture->data[0], *uc = picture->data[1], *vc = picture->data[2];
-unsigned
-unsigned       y,x, vWidth = width / 32
-unsigned       halfwidth = width / 
+int    
+int            y, x, halfwidth = width / 2 
+int            vWidth = width / 3
-        
-        for (y = 0; y < halfheight; y++) {
@@ -213 +189 @@
-                __m128i * uv = (__m128i*)uc,* vv  = (__m128i*)vc;
-                
-
+
+
+
-                asm volatile(
-                        "\n0:                   \n\t"
@@ -253 +231 @@
-                        "movntdq        %%xmm6, 48(%1)  \n\t" /*ov2[x4+3]*/
-                        "addl           $64,    %1              \n\t"
-
+l
-                        "jnz            0b                              \n\t"
-                        : "+r" (ov), "+r" (ov2),
-
-
+
+
+
-                        );
-#else
-                for (x = 0; x < vWidth; x++) {
-unsigned
+int
-
-                        __m128i tmp_y = yv[x2], tmp_y3 = yv[x2+1],
@@ -282 +261 @@
-
-                for (x=vWidth * 16; x < halfwidth; x++) {
-unsigned
+int
-                        o2[x4] = o[x4] = uc[x];
-                        o[x4 + 1] = yc[x2];
@@ -296 +275 @@
-                vc += rV;
-        }
-
-
-
+
-        HandleLastRow(o, yc, uc, vc, halfwidth, height);
-}
-
-
-
-
-UInt8          *yc = picture->data[0], *u = picture->data[1], *v = picture->data
-unsigned       rY = picture->linesize[0], rU = picture->linesize[1], rV = picture->linesize[2], 
-unsigned
+
+
+
+int            rY = picture->linesize[0], rU = picture->linesize[1], rV = picture->linesize
+int            
+int    
-        
-        for (y = 0; y < halfheight; y ++) {
@@ -313 +290 @@
-                
-                for (x = 0; x < halfwidth; x++) {
-unsigned
+int
-                        o2[x4] = o[x4] = u[x];
-                        o[x4 + 1] = yc[x2];
@@ -330 +307 @@
-        HandleLastRow(o, yc, u, v, halfwidth, height);
-}
-
-void Y420toY422(UInt8 * o, unsigned outRB, unsigned width, unsigned height, AVFrame * picture)
-{
-        uintptr_t yc = (uintptr_t)picture->data[0];
-
-        //make sure the ffmpeg picture buffers are aligned enough, they're only guaranteed to be 8-byte for some reason...
-        if (!unlikely((yc | picture->linesize[0]) % 16)) Y420toY422_sse2(o, outRB, width, height, picture); 
-        else Y420toY422_x86_scalar(o, outRB, width, height, picture);
-}
-#endif
-
-
-
-
-
+
+
+
+
+
+
+
-        
-        for (y = 0; y < height; y++) {
@@ -364 +335 @@
-}
-
-
-
-
+
+
-        UInt8 *srcPtr = picture->data[0];
-
-
-
-
+
+
+
+
+
+
-                {
-j3 = j
-j3] = srcPtr[j
-j3+1] = srcPtr[j
-j3+2] = srcPtr[j
+x3 = x
+x3] = srcPtr[x
+x3+1] = srcPtr[x
+x3+2] = srcPtr[x
-                }
-                baseAddr += rowBytes;
-picture->linesize[0]
-
-
-
-
-
-
+srcRB
+
+
+
+
+
+
-        UInt8 *srcPtr = picture->data[0];
-
+
+
+
-        for (y = 0; y < height; y++) {
-#ifdef __BIG_ENDIAN__
-                memcpy(baseAddr, srcPtr, width * 4);
-#else
-                unsigned x;
-                UInt32 *oRow = (UInt32 *)baseAddr, *iRow = (UInt32 *)srcPtr;
-
+
+
-#endif
-                
-                baseAddr += rowBytes;
-
-
-
-
-
-
-
+
+
+
+
+
+
-        UInt8 *srcPtr = picture->data[0];
+        int srcRB = picture->linesize[0];
+        int y;
-        
-        for (y = 0; y < height; y++) {
@@ -411 +386 @@
-                
-                baseAddr += rowBytes;
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-        
-        for (y = 0; y < height; y++) {
-                for (x = 0; x < halfwidth; x++) {
-unsigned
+int
-                        o[x4] = u[x];
-                        o[x4 + 1] = yc[x2];
@@ -435 +411 @@
-        }
-}
+
+static void ClearRGB(UInt8 *baseAddr, int rowBytes, unsigned width, unsigned height, int bytesPerPixel)
+{
+        int y;
+        
+        for (y = 0; y < height; y++) {
+                memset(baseAddr, 0, width * bytesPerPixel);
+                
+                baseAddr += rowBytes;
+        }
+}
+
+static FASTCALL void ClearRGB32(UInt8 *baseAddr, int rowBytes, unsigned width, unsigned height)
+{
+        ClearRGB(baseAddr, rowBytes, width, height, 4);
+}
+
+static FASTCALL void ClearRGB24(UInt8 *baseAddr, int rowBytes, unsigned width, unsigned height)
+{
+        ClearRGB(baseAddr, rowBytes, width, height, 3);
+}
+
+static FASTCALL void ClearV408(UInt8 *baseAddr, int rowBytes, unsigned width, unsigned height)
+{
+        int x, y;
+        
+        for (y = 0; y < height; y++)
+        {
+                for (x = 0; x < width; x++)
+                {
+                        unsigned x4 = x * 4;
+                        baseAddr[x4]   = 0x80; //zero chroma
+                        baseAddr[x4+1] = 0x10; //black
+                        baseAddr[x4+2] = 0x80; 
+                        baseAddr[x4+3] = 0xEB; //opaque
+                }
+                baseAddr += rowBytes;
+        }
+}
+
+static FASTCALL void ClearY422(UInt8 *baseAddr, int rowBytes, unsigned width, unsigned height)
+{
+        int x, y;
+        
+        for (y = 0; y < height; y++)
+        {
+                for (x = 0; x < width; x++)
+                {
+                        unsigned x2 = x * 2;
+                        baseAddr[x2]   = 0x80; //zero chroma
+                        baseAddr[x2+1] = 0x10; //black
+                }
+                baseAddr += rowBytes;
+        }
+}
+
+static FASTCALL void ClearNone(UInt8 *baseAddr, int rowBytes, unsigned width, unsigned height)
+{
+}
+
+int ColorConversionFindFor(ColorConversionFuncs *funcs, enum PixelFormat ffPixFmt, AVFrame *ffPicture, OSType qtPixFmt)
+{       
+        if (qtPixFmt == kYUV420CodecType && ffPixFmt == PIX_FMT_YUV420P)
+        {
+                funcs->clear = ClearNone;
+                funcs->convert = FastY420;
+        }
+        else if (qtPixFmt == k2vuyPixelFormat && ffPixFmt == PIX_FMT_YUV420P)
+        {
+                funcs->clear = ClearY422;
+
+#ifdef __ppc__
+                if (IsAltivecSupported())
+                        funcs->convert = Y420toY422_ppc_altivec;
+                else
+                        funcs->convert = Y420toY422_ppc_scalar;
+#else
+                //can't set this without the first real frame
+                if (ffPicture) {
+                        if (ffPicture->linesize[0] % 16)
+                                funcs->convert = Y420toY422_x86_scalar;
+                        else
+                                funcs->convert = Y420toY422_sse2;
+                }
+#endif          
+        }
+        else if (qtPixFmt == k24RGBPixelFormat && ffPixFmt == PIX_FMT_BGR24)
+        {
+                funcs->clear = ClearRGB24;
+                funcs->convert = BGR24toRGB24;
+        }
+        else if (qtPixFmt == k32ARGBPixelFormat && ffPixFmt == PIX_FMT_RGB32)
+        {
+                funcs->clear = ClearRGB32;
+                funcs->convert = RGB32toRGB32;
+        }
+        else if (qtPixFmt == k24RGBPixelFormat && ffPixFmt == PIX_FMT_RGB24)
+        {
+                funcs->clear = ClearRGB24;
+                funcs->convert = RGB24toRGB24;
+        }
+        else if (qtPixFmt == k2vuyPixelFormat && ffPixFmt == PIX_FMT_YUV422P)
+        {
+                funcs->clear = ClearY422;
+                funcs->convert = Y422toY422;
+        }
+        else if (qtPixFmt == k4444YpCbCrA8PixelFormat && ffPixFmt == PIX_FMT_YUVA420P)
+        {
+                funcs->clear = ClearV408;
+                funcs->convert = YA420toV408;
+        }
+        else
+        {
+                return paramErr;
+        }
+        
+        return noErr;
+}

trunk/ColorConversions.h

@@ -19 +19 @@
-
-#include <Carbon/Carbon.h>
-
+libavcodec/
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

trunk/CommonUtils.c

@@ -387 +387 @@
-        return forced;
-}
+
+int IsAltivecSupported()
+{
+        static int altivec = -1;
+        
+        if (altivec == -1) {
+                long response = 0;
+                int err = Gestalt(gestaltPowerPCProcessorFeatures, &response);
+                
+                altivec = !err && ((response & gestaltPowerPCHasVectorInstructions) != 0);
+        }
+        
+        return altivec;
+}

trunk/CommonUtils.h

@@ -41 +41 @@
-int IsFrameDroppingEnabled();
-int forcePerianToDecode();
+        
+int IsAltivecSupported();
-
-#ifdef __cplusplus

trunk/FFusionCodec.c

@@ -132 +132 @@
-        struct decode_glob      decode;
-        struct decode_stats stats;
+        ColorConversionFuncs colorConv;
-} FFusionGlobalsRecord, *FFusionGlobals;
-
@@ -1349 +1350 @@
-    OSErr err = noErr;
-    FFusionDecompressRecord *myDrp = (FFusionDecompressRecord *)drp->userDecompressRecord;
-int i, j
+AVFrame *picture
-        
-        glob->stats.type[drp->frameType].draw_calls++;
@@ -1355 +1356 @@
-        FFusionDebugPrint("%p DrawBand #%d. (%sdecoded)\n", glob, myDrp->frameNumber, not(myDrp->decoded));
-        
-
+ {
-                err = FFusionCodecDecodeBand(glob, drp, 0);
-
-
+
+
+
-        
-        if (myDrp->buffer)
@@ -1374 +1376 @@
-                else if(glob->lastDisplayedFrame.data[0] != NULL)
-                        //Display last frame
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-                }
-        }
-        else
-        {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    return err;
-}

trunk/Patches/ffmpeg-no-interlaced.diff

@@ -1 +1 @@
-Index: ffmpeg/libavcodec/h264.h
-===================================================================
-4508
+7451
-+++ ffmpeg/libavcodec/h264.h    (working copy)
-7 +55,7
+10 +55,13
- 
- /* Compiling in interlaced support reduces the speed
@@ -10 +10 @@
-+//#define ALLOW_INTERLACE
- 
-
+
+
- 
++#undef CODEC_FLAG2_CHUNKS
++#define CODEC_FLAG2_CHUNKS 0
++
+ /**
+  * The maximum number of slices supported by the decoder.
+  * must be a power of 2

trunk/Perian.xcodeproj/project.pbxproj

@@ -59 +59 @@
-                        buildConfigurationList = F5CFD2EA0B5012E800616865 /* Build configuration list for PBXAggregateTarget "A52Codec" */;
-                        buildPhases = (
-                                3D79C0540DFBA1FF00EEFE22 /* ShellScript */,
-                                F5CFD2E00B5012BC00616865 /* CopyFiles */,
-                                F5CFD2E30B5012DB00616865 /* CopyFiles */,
@@ -1562 +1561 @@
-                        runOnlyForDeploymentPostprocessing = 0;
-                        shellPath = /bin/sh;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-                };
-                F5121EB60EB3A54A0048EF67 /* ShellScript */ = {
@@ -2121 +2107 @@
-                                LIBRARY_SEARCH_PATHS = $SYMROOT/Universal;
-                                OTHER_CFLAGS = "$(OTHER_CFLAGS_$(CURRENT_ARCH))";
-mtune=nocona
-
+frerun-cse-after-loop
+-mcpu=G3 -mtune=G5 -funroll-loops -mmultiple 
-                                OTHER_LDFLAGS = (
-                                        "-framework",

trunk/Subtitles/SubATSUIRenderer.m

@@ -24 +24 @@
-        ATSUStyle style;
-        CGColorRef primaryColor, outlineColor, shadowColor;
-
+, platformSizeScale, fontSize
-        BOOL blurEdges;
+        ATSUFontID font;
+        ATSUVerticalCharacterType fontVertical;
-}
--(SubATSUISpanEx*)initWithStyle:(ATSUStyle)style_ subStyle:(SubStyle*)sstyle colorSpace:(CGColorSpaceRef)cs;
@@ -73 +75 @@
--(SubATSUISpanEx*)initWithStyle:(ATSUStyle)style_ subStyle:(SubStyle*)sstyle colorSpace:(CGColorSpaceRef)cs
-{
+        ByteCount unused;
+        
-        if (self = [super init]) {
-                ATSUCreateAndCopyStyle(style_, &style);
@@ -86 +90 @@
-                scaleY = sstyle->scaleY / 100.;
-                angle = sstyle->angle;
+                platformSizeScale = sstyle->platformSizeScale;
+                fontSize = sstyle->size;
+                ATSUGetAttribute(style, kATSUFontTag, sizeof(ATSUFontID), &font, &unused);
+                ATSUGetAttribute(style, kATSUVerticalCharacterTag, sizeof(ATSUVerticalCharacterType), &fontVertical, &unused);
-        }
-        
@@ -106 +114 @@
-        ret->scaleY = scaleY;
-        ret->angle = angle;
+        ret->platformSizeScale = platformSizeScale;
+        ret->fontSize = fontSize;
+        ret->font = font;
+        ret->fontVertical = fontVertical;
-        
-        return [ret autorelease];
@@ -308 +320 @@
-// XXX: Assumes ATSUFontID = ATSFontRef. This is true.
-static ATSUFontID GetFontIDForSSAName(NSString *name)
-
+
+
+
+
+
+
+
+
-        ByteCount nlen = [name length];
-        unichar *uname = (unichar*)[name cStringUsingEncoding:NSUnicodeStringEncoding];
-        
-        if (!fontIDCache) fontIDCache = [[NSMutableDictionary alloc] init];
-        
-        NSNumber *idN = [fontIDCache objectForKey:[name lowercaseString]];
-                
-        if (idN) return [idN intValue];
-        
-        ATSUFontID font;
-        
@@ -366 +378 @@
-        ATSStyleRenderingOptions opt = kATSStyleApplyAntiAliasing;
-        Fixed size;
-bold
+weight > 0
-        ATSUStyle style;
-                
@@ -372 +384 @@
-        
-        if (!s->platformSizeScale) s->platformSizeScale = GetWinFontSizeScale(fontRef);
-
+ //FIXME several other values also change relative to PlayRes but aren't handled
-        
-        ATSUCreateStyle(&style);
@@ -416 +428 @@
-        SubATSUISpanEx *spanEx = ex;
-        [spanEx release];
+}
+
+static void UpdateFontNameSize(SubATSUISpanEx *spanEx, float screenScale)
+{
+        Fixed fSize = FloatToFixed(spanEx->fontSize * spanEx->platformSizeScale * screenScale);
+        SetATSUStyleOther(spanEx->style, kATSUFontTag, sizeof(ATSUFontID), &spanEx->font);
+        SetATSUStyleOther(spanEx->style, kATSUVerticalCharacterTag, sizeof(ATSUVerticalCharacterType), &spanEx->fontVertical);
+        SetATSUStyleOther(spanEx->style, kATSUSizeTag, sizeof(Fixed), &fSize);
-}
-
@@ -443 +463 @@
-        switch (tag) {
-                case tag_b:
-
+ // XXX font weight variations
-                        SetATSUStyleFlag(spanEx->style, kATSUQDBoldfaceTag, bval != 0);
-                        break; 
@@ -470 +490 @@
-                case tag_fn:
-                        sv();
-
-
-
-
-
-
-
-
-
+
+
+
-                        break;
-                case tag_fs:
-                        fv();
-fixval = FloatToFixed(fval * div->styleLine->platformSizeScale)
-SetATSUStyleOther(spanEx->style, kATSUSizeTag, sizeof(Fixed), &fixval
+spanEx->fontSize = fval
+UpdateFontNameSize(spanEx, screenScaleY
-                        break;
-                case tag_1c:
@@ -523 +537 @@
-                        break;
-                case tag_frz:
+                        fv();
-                        if (!isFirstSpan) div->render_complexity |= renderComplexTransforms; // this one's hard
-                        fv();
-                        spanEx->angle = fval;
-                        break;
@@ -562 +576 @@
-                case tag_be:
-                        bv();
-
+ // XXX blur edges
-                        spanEx->blurEdges = bval;
-                        break;

trunk/Subtitles/SubContext.h

@@ -29 +29 @@
-        Float32 outlineRadius, shadowDist;
-        unsigned marginL, marginR, marginV;
-
+
+
-        UInt8 alignH, alignV, borderStyle;
-        __strong void* ex;

trunk/Subtitles/SubContext.m

@@ -68 +68 @@
-        if ([*fontname characterAtIndex:0] == '@') {
-                *fontname = [*fontname substringFromIndex:1];
-return YES;
+//return YES; // XXX vertical
-        }
-        return NO;
@@ -89 +89 @@
-        sty->shadowDist = 2;
-        sty->marginL = sty->marginR = sty->marginV = 20;
-bold = YES
+weight = 1
-        sty->italic = sty->underline = sty->strikeout = NO;
-        sty->alignH = kSubAlignmentCenter;
@@ -121 +121 @@
-                cv(outlineColor, OutlineColour);
-                cv(shadowColor, ShadowColour);
-bv(bold
+fv(weight
-                bv(italic, Italic);
-                bv(underline, Underline);
@@ -138 +138 @@
-                if (!scaleX) scaleX = 100;
-                if (!scaleY) scaleY = 100;
+                if (weight == -1) weight = 1;
-
-                UInt8 align = [[s objectForKey:@"Alignment"] intValue];

trunk/Subtitles/SubParsing.h

@@ -27 +27 @@
-        int posX, posY;
-        UInt8 alignH, alignV, wrapStyle, render_complexity;
-is_shape, 
+
-        
-        unsigned layer;

trunk/Subtitles/SubParsing.m.rl

@@ -65 +65 @@
-                alignH = kSubAlignmentMiddle; alignV = kSubAlignmentBottom;
-                
-is_shape = 
+
-                render_complexity = 0;
-        }
@@ -91 +91 @@
-  div->wrapStyle = wrapStyle;
-  
-    div->is_shape = NO;
-        div->positioned = positioned;
-        div->render_complexity = render_complexity;
@@ -272 +271 @@
-                        unsigned curX, curY;
-                        int intnum = 0;
-
+, dropThisSpan = NO
-                        
-                        %%{
@@ -300 +299 @@
-                                action shadowa {tag(4a, intnum);}
-                                action stylerevert {tag(r, strval);}
+                                action drawingmode {tag(p, floatnum); dropThisSpan = floatnum > 0;}
-
-                                action paramset {parambegin=p;}
@@ -390 +390 @@
-                                                        |("fad" "e"? parens)
-                                                        |"clip" parens
-
+ %drawingmode
-                                                        |"pbo" floatnum
-                                           );
@@ -420 +420 @@
-                                }
-                                
-
-
+
+
+
-                                        if (p == pe) reached_end = YES;
-                                        
@@ -431 +432 @@
-                                        
-                                        last_tag_start = p;
+                                        dropThisSpan = NO;
-                                }
-                                

trunk/Subtitles/SubRenderer.h

@@ -13 +13 @@
-
-typedef enum {tag_b=0, tag_i, tag_u, tag_s, tag_bord, tag_shad, tag_be, tag_fn, tag_fs, tag_fscx, tag_fscy, tag_fsp, tag_frx, tag_fry, tag_frz, tag_1c, tag_2c, tag_3c, tag_4c, 
-
+, tag_p
-
-#ifndef __OBJC_GC__

trunk/createStaticLibs.sh

@@ -1 +1 @@
-#!/bin/sh -v
-$PATH:/usr/local/bin:/usr/bin:/sw/bin:/opt/local/bin
+/usr/local/bin:/sw/bin:/opt/local/bin:/usr/bin:$PATH
-buildid_ffmpeg="r`svn info ffmpeg | grep -F Revision | awk '{print $2}'`"
-
@@ -77 +77 @@
-fi
-
-if [ -e ffmpeg/patched ] ; then
-        (cd ffmpeg && svn revert -R . && rm patched)
-fi
-
-patch -p0 < Patches/ffmpeg-h264dsp-crash.diff
-patch -p0 < Patches/ffmpeg-forceinline.diff
-patch -p0 < Patches/ffmpeg-no-interlaced.diff
-patch -p0 < Patches/ffmpeg-faltivec.diff
-patch -p0 < Patches/ffmpeg-h264-nounrollcabac.diff
-touch ffmpeg/patched
-
-# if [ $no_pic -eq 0 ] ; then
-# (cd ffmpeg; patch -p1 < ../Patches/ffmpeg-pic.diff)
-# fi
-
-touch patched
-
-if [ "$buildid_ffmpeg" = "$oldbuildid_ffmpeg" ] ; then
-    echo "Static ffmpeg libs are up-to-date ; not rebuilding"
@@ -99 +82 @@
-    echo "Static ffmpeg libs are out-of-date ; rebuilding"
-    
+    if [ -e ffmpeg/patched ] ; then
+                cd ffmpeg && svn revert -R . && rm patched && cd ..
+        fi
+
+        patch -p0 < Patches/ffmpeg-forceinline.diff
+        patch -p0 < Patches/ffmpeg-no-interlaced.diff
+        patch -p0 < Patches/ffmpeg-faltivec.diff
+        patch -p0 < Patches/ffmpeg-h264-nounrollcabac.diff
+        touch ffmpeg/patched
+
-    echo -n "Building "
-    if [ $buildi386 -eq $buildppc ] ; then