Changeset 165

Timestamp:

10/18/06 20:23:00 (2 years ago)

Author:

astrange

Message:

Update ffmpeg configure script. (it's temporarily broken on x86/Development anyway)
Replace Quartz text rendering with ATSUI.
Unicode now works; outlines and antialiasing don't anymore.
Soft line breaks yet to be done.

Files:

• trunk/TextSubCodec.c (modified) (7 diffs)
• trunk/createStaticLibs.sh (modified) (2 diffs)

trunk/TextSubCodec.c

@@ -24 +24 @@
-        CGColorSpaceRef         colorSpace;
-        
+        ATSUStyle                               textStyle;
+        ATSUTextLayout                  textLayout;
-        //Ptr                     textBuffer;
-} TextSubGlobalsRecord, *TextSubGlobals;
@@ -115 +117 @@
-                        CGColorSpaceRelease(glob->colorSpace);
-                }
-
+
+
+
+
+
+
-                DisposePtr((Ptr)glob);
-        }
@@ -217 +224 @@
-        if (glob->colorSpace == NULL)
-                glob->colorSpace = CGColorSpaceCreateWithName(kCGColorSpaceGenericRGB);
-
+
-        return noErr;
-}
@@ -273 +280 @@
-                                                                                   kCGImageAlphaPremultipliedFirst);
-        
+        if (!glob->textStyle) { //TODO: set language region based on track language... does that even matter?
+                ATSUAttributeTag tags[] = {kATSUSizeTag, kATSURGBAlphaColorTag, kATSUStyleRenderingOptionsTag, kATSUFontTag};
+                ByteCount                sizes[] = {sizeof(Fixed), sizeof(ATSURGBAlphaColor), sizeof(ATSStyleRenderingOptions), sizeof(ATSUFontID)};
+                Fixed                    size = X2Fix(sqrt(myDrp->width*myDrp->width+myDrp->height*myDrp->height)*.04); ATSURGBAlphaColor yellow = {1,1,0,1};
+                Boolean                  trueval = TRUE; ATSUFontID fid; ATSStyleRenderingOptions rend = kATSStyleApplyAntiAliasing;
+                ATSUAttributeValuePtr vals[] = {&size,&yellow,&rend,&fid};
+                ATSUCreateStyle(&glob->textStyle);
+                ATSUFindFontFromName("Helvetica Neue Condensed Bold",strlen("Helvetica Neue Condensed Bold"),kFontFullName,kFontNoPlatform,kFontNoScript,kFontNoLanguage,&fid);
+                ATSUSetAttributes(glob->textStyle,4, tags, sizes, vals);
+        }
+        
+        if (!glob->textLayout) {
+                ATSUAttributeTag tags[] = {kATSULineFlushFactorTag, kATSULineWidthTag};
+                ByteCount                sizes[] = {sizeof(Fract),sizeof(ATSUTextMeasurement)};
+                Fract                    lf = kATSUCenterAlignment; ATSUTextMeasurement w = Long2Fix(myDrp->width);
+                ATSUAttributeValuePtr vals[] = {&lf, &w};
+                ATSUCreateTextLayout(&glob->textLayout);
+                ATSUSetLayoutControls(glob->textLayout, 2, tags, sizes, vals);
+        }
+        
-        // ultra basic support for multiple lines; relies on \n deliminator
-        int lineStarts[10] = {0};
@@ -278 +305 @@
-        
-        // QuickTime doesn't like it if we complain too much
-c == NULL
+!c || !glob->textStyle
-                return noErr;
-
@@ -298 +325 @@
-                numLines = 9;
-
+        ATSUAttributeTag cgc[] = {kATSUCGContextTag};
+        ByteCount cgc_s[] = {sizeof(CGContextRef)};
+        ATSUAttributeValuePtr cgc_v[] = {&c};
+        ATSUSetLayoutControls(glob->textLayout, 1, cgc, cgc_s, cgc_v);
+
-        CGContextClearRect(c, CGRectMake(0, 0, myDrp->width, myDrp->height));
-        
-        // hardcoded subtitle font+size...
-        CGContextSelectFont(c, "HelveticaNeue-CondensedBold", 30, kCGEncodingMacRoman);
-        CGContextSetRGBFillColor(c, 1, 1, .1, 1);
-        CGContextSetRGBStrokeColor(c, 0, 0, 0, 1);
-
-        int drawnLines = 0;
-        for (i = numLines - 1; i >= 0; i--) {
@@ -311 +338 @@
-                if (sublen == 0)
-                        continue;
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-        

trunk/createStaticLibs.sh

@@ -35 +35 @@
-        cd "$BUILDDIR"
-        if [ `arch` != i386 ] ; then
-cpu
+arch
-        else
-                "$SRCROOT/ffmpeg/configure" --enable-pp --enable-gpl --enable-memalign-hack $extraConfigureOptions $generalConfigureOptions
@@ -57 +57 @@
-                "$SRCROOT/ffmpeg/configure" --enable-pp --enable-gpl $extraConfigureOptions $generalConfigureOptions
-        else
-cpu
+arch
-        fi
-        make -C libavutil   depend