Changeset 1036

Timestamp:

03/29/09 00:40:09 (17 months ago)

Author:

astrange

Message:

Build system/logging:
- Don't regenerate SubParsing?.m/ffmpeg universal libs if not needed
- Print "Perian" instead of "Perian Codec"

Subtitles:
- Rewrite SubSerializer?; much shorter and correct now (aside from line order).
(fixes many dropped lines in Live-eviL Captain Harlock and gg Sayonara Zetsubou Sensei)
- Fix some bugs where line spans were rendered more than once with the wrong style.
(fixes transparency in Spice and Wolf 01 [ADTRW].mkv)
- Ignore \blur properly
(fixes unstyled lines in [gg]_Goku_Sayonara_Zetsubou_Sensei_-_02_[D284BF24].mkv)
- Fix an overrelease crash

Location:

trunk

Files:

• Codecprintf.c (modified) (1 diff)
• FFusionCodec.c (modified) (1 diff)
• Perian.xcodeproj/project.pbxproj (modified) (1 diff)
• Subtitles/SubATSUIRenderer.m (modified) (13 diffs)
• Subtitles/SubContext.m (modified) (1 diff)
• Subtitles/SubImport.h (modified) (3 diffs)
• Subtitles/SubImport.mm (modified) (5 diffs)
• Subtitles/SubParsing.h (modified) (1 diff)
• Subtitles/SubParsing.m.rl (modified) (5 diffs)
• Subtitles/SubRenderer.h (modified) (3 diffs)
• createStaticLibs.sh (modified) (1 diff)

trunk/Codecprintf.c

@@ -13 +13 @@
 #include "log.h"
 
-#define CODEC_HEADER                    "Perian Codec: "
+#define CODEC_HEADER                    "Perian: "
 
 static int Codecvprintf(FILE *fileLog, const char *format, va_list va, int print_header)

trunk/FFusionCodec.c

@@ -1018 +1018 @@
         
         if (!glob->avContext) {
-                fprintf(stderr, "Perian Codec: QT tried to call BeginBand without preflighting!\n");
+                fprintf(stderr, "Perian: QT tried to call BeginBand without preflighting!\n");
                 return internalComponentErr;
         }

trunk/Perian.xcodeproj/project.pbxproj

@@ -275 +275 @@
                                 "$(DERIVED_FILES_DIR)/$(INPUT_FILE_BASE).dot",
                         );
-                        script = "RAGEL=${PROJECT_DIR}/Subtitles/ragel\nRLCODEGEN=${PROJECT_DIR}/Subtitles/rlgen-cd\n${RAGEL} ${INPUT_FILE_PATH} | ${RLCODEGEN} -T0 -o ${DERIVED_FILES_DIR}/${INPUT_FILE_BASE}\n";
+                        script = "RAGEL=${PROJECT_DIR}/Subtitles/ragel\nRLCODEGEN=${PROJECT_DIR}/Subtitles/rlgen-cd\n[ ${INPUT_FILE_PATH} -nt ${DERIVED_FILES_DIR}/${INPUT_FILE_BASE} ] || exit 0\n${RAGEL} ${INPUT_FILE_PATH} | ${RLCODEGEN} -T0 -o ${DERIVED_FILES_DIR}/${INPUT_FILE_BASE}\n";
                 };
 /* End PBXBuildRule section */

trunk/Subtitles/SubATSUIRenderer.m

@@ -119 +119 @@
         ret->fontVertical = fontVertical;
         
-        return [ret autorelease];
+        return ret;
+}
+
+-(NSString*)description
+{
+        return [NSString stringWithFormat:@"SpanEx with alpha %f/%f", primaryAlpha, outlineAlpha];
 }
 @end
@@ -416 +421 @@
 -(void*)spanExtraFromRenderDiv:(SubRenderDiv*)div
 {
-        return [[[SubATSUISpanEx alloc] initWithStyle:(ATSUStyle)div->styleLine->ex subStyle:div->styleLine colorSpace:srgbCSpace] autorelease];
+        return [[SubATSUISpanEx alloc] initWithStyle:(ATSUStyle)div->styleLine->ex subStyle:div->styleLine colorSpace:srgbCSpace];
 }
 
@@ -424 +429 @@
 }
 
--(void)disposeSpanExtra:(void*)ex
+-(void)releaseSpanExtra:(void*)ex
 {
         SubATSUISpanEx *spanEx = ex;
         [spanEx release];
+}
+
+-(NSString*)describeSpanEx:(void*)ex
+{
+        SubATSUISpanEx *spanEx = ex;
+        return [spanEx description];
 }
 
@@ -840 +851 @@
         UniCharArrayOffset *breaks;
         ItemCount breakCount;
-        unsigned lStart, lEnd;
+        int lStart, lEnd;
         SInt8 direction;
 } BreakContext;
@@ -870 +881 @@
                         if_different(outlineAlpha) {
                                 if (endLayer) CGContextEndTransparencyLayer(c);
-                                
                                 CGContextSetAlpha(c, spanEx->outlineAlpha);
                                 if (spanEx->outlineAlpha != 1.) {
@@ -906 +916 @@
                 if (!lineLen) return;
         }
-        
+
         if (textType == kTextLayerOutline && div->styleLine->borderStyle == kSubBorderStyleBox) {
                 ATSUTextMeasurement lineWidth, lineHeight, lineX, lineY;
@@ -944 +954 @@
                         extraHeight = div->styleLine->outlineRadius;
                 } else {
-                        int j, spans = [div->spans count];
+                        int j, nspans = [div->spans count];
                         
                         //linear search for the next span to draw
-                        for (j = 0; j < spans; j++) {
+                        //XXX not at all sure how this works or if it's correct
+                        for (j = 0; j < nspans; j++) {
                                 SubRenderSpan *span = [div->spans objectAtIndex:j];
                                 SubATSUISpanEx *spanEx = span->ex;
                                 UniCharArrayOffset spanLen, drawStart, drawLen;
                                 
-                                if (j < spans-1) {
+                                if (j < nspans-1) {
                                         SubRenderSpan *nextSpan = [div->spans objectAtIndex:j+1];
                                         spanLen = nextSpan->offset - span->offset;
                                 } else spanLen = [div->text length] - span->offset;
-                                
-                                if (spanLen == 0) continue;
-                                if ((span->offset + spanLen) < thisBreak) continue; // too early
-                                if (span->offset >= nextBreak) break; // too far ahead
                                 
                                 if (span->offset < thisBreak) { // text spans a newline
@@ -966 +973 @@
                                 } else {
                                         drawStart = span->offset;
-                                        drawLen = spanLen;
+                                        drawLen = MIN(spanLen, nextBreak - span->offset);
                                 }
+                                
+                                if (spanLen == 0 || drawLen == 0) continue;
+                                if ((span->offset + spanLen) < thisBreak) continue; // too early
+                                if (span->offset >= nextBreak) break; // too far ahead
 
                                 endLayer = SetupCGForSpan(c, spanEx, lastSpanEx, div, textType, endLayer);
@@ -980 +991 @@
                 penY += breakc.direction * (GetLineHeight(layout, thisBreak) + FloatToFixed(extraHeight));
         }
-        
+                
         if (endLayer) CGContextEndTransparencyLayer(c);
 
@@ -1041 +1052 @@
                         lastLayer = div->layer;
                 }
-                
+                                
                 NSRect marginRect = NSMakeRect(div->marginL, div->marginV, context->resX - div->marginL - div->marginR, context->resY - div->marginV - div->marginV);
                 
@@ -1174 +1185 @@
         SubtitleRendererPtr s = headerLen ? SubInitForSSA(header, headerLen, 640, 480)
                                                                       : SubInitNonSSA(640, 480);
-        
         /*
         CGColorSpaceRef csp = CGColorSpaceCreateWithName(kCGColorSpaceGenericRGB);
@@ -1181 +1191 @@
         
         if (!headerLen) {
-                SubRenderPacket(s, c, (CFStringRef)@"to Be continued", 640, 480);
+                SubRenderPacket(s, c, (CFStringRef)@"Abcde .", 640, 480);
         } else {
                 NSArray *styles = [s->context->styles allValues];
@@ -1188 +1198 @@
                 for (i = 0; i < nstyles; i++) {
                         SubStyle *sty = [styles objectAtIndex:i];
-                        NSString *line = [NSString stringWithFormat:@"0,0,%@,,0,0,0,,{\fs1}If you are seeing this message, your player doesn't fully support the formatted subtitle track. It is recommended you switch to the unformatted track.", sty->name];
+                        NSString *line = [NSString stringWithFormat:@"0,0,%@,,0,0,0,,Abcde .", sty->name];
                         SubRenderPacket(s, c, (CFStringRef)line, 640, 480);
                 }

trunk/Subtitles/SubContext.m

@@ -303 +303 @@
 -(void)releaseSpanExtra:(void*)ex {}
 -(float)aspectRatio {return 4./3.;}
+-(NSString*)describeSpanEx:(void*)ex {return @"";}
 @end

trunk/Subtitles/SubImport.h

@@ -41 +41 @@
         NSString *line;
         unsigned begin_time, end_time;
+        unsigned no; // line number, used only by SubSerializer
 }
 -(id)initWithLine:(NSString*)l start:(unsigned)s end:(unsigned)e;
@@ -47 +48 @@
 @interface SubSerializer : NSObject
 {
-        NSMutableArray *lines, *outpackets;
-        BOOL finished, write_gap;
-        unsigned last_time;
-        SubLine *toReturn;
+        // input lines, sorted by 1. beginning time 2. original insertion order
+        NSMutableArray *lines;
+        BOOL finished;
+        
+        unsigned last_begin_time, last_end_time;
+        unsigned linesInput;
 }
 -(void)addLine:(SubLine *)sline;
@@ -66 +69 @@
 
 - (id)initWithTime:(long)time offset:(long)offset;
-
 @end
 

trunk/Subtitles/SubImport.mm

@@ -1188 +1188 @@
         if (self = [super init]) {
                 lines = [[NSMutableArray alloc] init];
-                outpackets = [[NSMutableArray alloc] init];
                 finished = NO;
-                write_gap = NO;
-                toReturn = nil;
-                last_time = 0;
+                last_begin_time = last_end_time = 0;
+                linesInput = 0;
         }
         
@@ -1200 +1198 @@
 -(void)dealloc
 {
-        [outpackets release];
         [lines release];
         [super dealloc];
 }
 
--(void)addLine:(SubLine *)sline
-{
-        if (sline->begin_time < sline->end_time)
-                [lines addObject:sline];
-}
-
-static int cmp_line(id a, id b, void* unused)
-{                       
-        SubLine *av = (SubLine*)a, *bv = (SubLine*)b;
-        
-        if (av->begin_time > bv->begin_time) return NSOrderedDescending;
-        if (av->begin_time < bv->begin_time) return NSOrderedAscending;
-        return NSOrderedSame;
+static CFComparisonResult CompareLinesByBeginTime(const void *a, const void *b, void *unused)
+{
+        SubLine *al = (SubLine*)a, *bl = (SubLine*)b;
+        
+        if (al->begin_time > bl->begin_time) return kCFCompareGreaterThan;
+        if (al->begin_time < bl->begin_time) return kCFCompareLessThan;
+        
+        if (al->no > bl->no) return kCFCompareGreaterThan;
+        if (al->no < bl->no) return kCFCompareLessThan;
+        return kCFCompareEqualTo;
 }
 
@@ -1229 +1223 @@
 }
 
-static bool isinrange(unsigned base, unsigned test_s, unsigned test_e)
-{
-        return (base >= test_s) && (base < test_e);
-}
-
--(void)refill
-{
-        unsigned num = [lines count];
-        unsigned min_allowed = finished ? 1 : 2;
-        if (num < min_allowed) return;
-        unsigned times[num*2], last_last_end = 0;
-        SubLine *slines[num], *last=nil;
-        bool last_has_invalid_end = false;
-        
-        [lines sortUsingFunction:cmp_line context:nil];
-        [lines getObjects:slines];
-#ifdef SS_DEBUG
-        NSLog(@"pre - %@",lines);
-#endif  
-        //leave early if all subtitle lines overlap
+-(void)addLine:(SubLine *)line
+{
+        if (line->begin_time >= line->end_time) {
+                if (line->begin_time)
+                        Codecprintf(NULL, "Invalid times (%d and %d) for line \"%s\"", line->begin_time, line->end_time, [line->line UTF8String]);
+                return;
+        }
+        
+        line->no = linesInput++;
+        
+        int nlines = [lines count];
+        
+        if (!nlines || line->begin_time > ((SubLine*)[lines objectAtIndex:nlines-1])->begin_time) {
+                [lines addObject:line];
+        } else {
+                CFIndex i = CFArrayBSearchValues((CFArrayRef)lines, CFRangeMake(0, nlines), line, CompareLinesByBeginTime, NULL);
+                
+                if (i >= nlines)
+                        [lines addObject:line];
+                else
+                        [lines insertObject:line atIndex:i];
+        }
+        
+}
+
+-(SubLine*)getNextRealSerializedPacket
+{
+        int nlines = [lines count];
+        SubLine *first = [lines objectAtIndex:0];
+        int i;
+
         if (!finished) {
-                bool all_overlap = true;
-                int i;
-                
-                for (i=0;i < num-1;i++) {
-                        SubLine *c = slines[i], *n = slines[i+1];
-                        if (c->end_time <= n->begin_time) {all_overlap = false; break;}
-                }
-                
-                if (all_overlap) return;
-                
-                for (i=0;i < num-1;i++) {
-                        if (isinrange(slines[num-1]->begin_time, slines[i]->begin_time, slines[i]->end_time)) {
-                                num = i + 1; break;
+                if (nlines > 1) {
+                        unsigned maxEndTime = first->end_time;
+                        
+                        for (i = 1; i < nlines; i++) {
+                                SubLine *l = [lines objectAtIndex:i];
+                                
+                                if (l->begin_time >= maxEndTime) {
+                                        goto canOutput;
+                                }
+                                
+                                maxEndTime = MAX(maxEndTime, l->end_time);
                         }
                 }
-        }
-        
-        for (int i=0;i < num;i++) {
-                times[i*2]   = slines[i]->begin_time;
-                times[i*2+1] = slines[i]->end_time;
-        }
-        
-        qsort(times, num*2, sizeof(unsigned), cmp_uint);
-        
-        for (int i=0;i < num*2; i++) {
-                if (i > 0 && times[i-1] == times[i]) continue;
-                NSMutableString *accum = nil;
-                unsigned start = times[i], last_end = start, next_start=times[num*2-1], end = start;
-                bool finishedOutput = false, is_last_line = false;
-                
-                // Add on packets until we find one that marks it ending (by starting later)
-                // ...except if we know this is the last input packet from the stream, then we have to explicitly flush it
-                if (finished && (times[i] == slines[num-1]->begin_time || times[i] == slines[num-1]->end_time)) finishedOutput = is_last_line = true;
-                
-                for (int j=0; j < num; j++) {
-                        if (isinrange(times[i], slines[j]->begin_time, slines[j]->end_time)) {
-                                
-                                // find the next line that starts after this one
-                                if (j != num-1) {
-                                        unsigned ns = slines[j]->end_time;
-                                        for (int h = j; h < num; h++) if (slines[h]->begin_time != slines[j]->begin_time) {ns = slines[h]->begin_time; break;}
-                                                next_start = MIN(next_start, ns);
-                                } else next_start = slines[j]->end_time;
-                                
-                                last_end = MAX(slines[j]->end_time, last_end);
-                                if (accum) [accum appendString:slines[j]->line]; else accum = [[slines[j]->line mutableCopy] autorelease];
-                        } else if (j == num-1) finishedOutput = true;
+                
+                return nil;
+        }
+        
+canOutput:
+        NSMutableString *str = [NSMutableString stringWithString:first->line];
+        unsigned begin_time = last_end_time, end_time = first->end_time;
+        int deleted = 0;
+                
+        for (i = 1; i < nlines; i++) {
+                SubLine *l = [lines objectAtIndex:i];
+                if (l->begin_time >= end_time) break;
+                
+                //shorten packet end time if another shorter time (begin or end) is found
+                //as long as it isn't the begin time
+                end_time = MIN(end_time, l->end_time);
+                if (l->begin_time > begin_time)
+                        end_time = MIN(end_time, l->begin_time);
+                
+                if (l->begin_time <= begin_time)
+                        [str appendString:l->line];
+        }
+        
+        for (i = 0; i < nlines; i++) {
+                SubLine *l = [lines objectAtIndex:i - deleted];
+                
+                if (l->end_time == end_time) {
+                        [lines removeObjectAtIndex:i - deleted];
+                        deleted++;
                 }
-                
-                if (accum && finishedOutput) {
-                        [accum deleteCharactersInRange:NSMakeRange([accum length] - 1, 1)]; // delete last newline
-#ifdef SS_DEBUG
-                        NSLog(@"%d - %d %d",start,last_end,next_start); 
-#endif
-                        if (last_has_invalid_end) {
-                                if (last_end < next_start) { 
-                                        int j, set;
-                                        for (j=i; j >= 0; j--) if (times[j] == last->begin_time) break;
-                                        set = times[j+1];
-                                        last->end_time = set;
-                                } else last->end_time = MIN(last_last_end,start); 
-                        }
-                        end = last_end;
-                        last_has_invalid_end = false;
-                        if (last_end > next_start && !is_last_line) last_has_invalid_end = true;
-                        SubLine *event = [[SubLine alloc] initWithLine:accum start:start end:end];
-                        
-                        [outpackets addObject:event];
-                        
-                        last_last_end = last_end;
-                        last = event;
-                }
-        }
-        
-        if (last_has_invalid_end) {
-                last->end_time = times[num*2 - 3]; // end time of line before last
-        }
-#ifdef SS_DEBUG
-        NSLog(@"out - %@",outpackets);
-#endif
-        
-        if (finished) [lines removeAllObjects];
-        else {
-                num = [lines count];
-                for (int i = 0; i < num-1; i++) {
-                        if (isinrange(slines[num-1]->begin_time, slines[i]->begin_time, slines[i]->end_time)) break;
-                        [lines removeObject:slines[i]];
-                }
-        }
-#ifdef SS_DEBUG
-        NSLog(@"post - %@",lines);
-#endif
-}
-
--(SubLine*)_getSerializedPacket
-{
-        if ([outpackets count] == 0)  {
-                [self refill];
-                if ([outpackets count] == 0) 
-                        return nil;
-        }
-        
-        SubLine *sl = [outpackets objectAtIndex:0];
-        [outpackets removeObjectAtIndex:0];
-        
-        [sl autorelease];
-        return sl;
+        }
+        
+        return [[SubLine alloc] initWithLine:str start:begin_time end:end_time];
 }
 
 -(SubLine*)getSerializedPacket
 {
-        if (!last_time) {
-                SubLine *ret = [self _getSerializedPacket];
-                if (ret) {
-                        last_time = ret->end_time;
-                        write_gap = YES;
-                }
-                return ret;
-        }
-        
-restart:
-        
-        if (write_gap) {
-                SubLine *next = [self _getSerializedPacket];
-                SubLine *sl;
-
-                if (!next) return nil;
-
-                toReturn = [next retain];
-                
-                write_gap = NO;
-                
-                if (toReturn->begin_time > last_time) sl = [[SubLine alloc] initWithLine:@"\n" start:last_time end:toReturn->begin_time];
-                else goto restart;
-                
-                return [sl autorelease];
+        int nlines = [lines count];
+
+        if (!nlines) return nil;
+        
+        SubLine *nextline = [lines objectAtIndex:0], *ret;
+        
+        if (nextline->begin_time > last_end_time) {
+                ret = [[SubLine alloc] initWithLine:@"\n" start:last_end_time end:nextline->begin_time];
         } else {
-                SubLine *ret = toReturn;
-                last_time = ret->end_time;
-                write_gap = YES;
-                
-                toReturn = nil;
-                return [ret autorelease];
-        }
-}
-
--(void)setFinished:(BOOL)f
-{
-        finished = f;
+                ret = [self getNextRealSerializedPacket];
+        }
+        
+        if (!ret) return nil;
+        
+        last_begin_time = ret->begin_time;
+        last_end_time   = ret->end_time;
+                
+        return [ret autorelease];
+}
+
+-(void)setFinished:(BOOL)_finished
+{
+        finished = _finished;
 }
 
 -(BOOL)isEmpty
 {
-        return [lines count] == 0 && [outpackets count] == 0 && !toReturn;
+        return [lines count] == 0;
 }
 
 -(NSString*)description
 {
-        return [NSString stringWithFormat:@"i: %d o: %d finished inputting: %d",[lines count],[outpackets count],finished];
+        return [NSString stringWithFormat:@"lines left: %d finished inputting: %d",[lines count],finished];
 }
 @end
@@ -1420 +1349 @@
                 begin_time = s;
                 end_time = e;
+                no = 0;
         }
         
@@ -1433 +1363 @@
 -(NSString*)description
 {
-        return [NSString stringWithFormat:@"\"%@\", from %d s to %d s",line,begin_time,end_time];
+        return [NSString stringWithFormat:@"\"%@\", from %d s to %d s",[line substringToIndex:[line length]-1],begin_time,end_time];
 }
 @end

trunk/Subtitles/SubParsing.h

@@ -37 +37 @@
         @public;
         UniCharArrayOffset offset;
-        __strong void *ex;
+        id ex;
         SubRenderer *delegate;
 }

trunk/Subtitles/SubParsing.m.rl

@@ -41 +41 @@
 }
 
--(void)finalize {[delegate releaseSpanExtra:ex]; [super finalize];}
+-(void)finalize
+{
+        [delegate releaseSpanExtra:ex];
+        [super finalize];
+}
+
+-(NSString*)description
+{
+        return [NSString stringWithFormat:@"Span at %d: %@", offset, [delegate describeSpanEx:ex]];
+}
 @end
 
@@ -191 +200 @@
 %%machine SSAtag;
 %%write data;
-
-static NSMutableString *FilterSlashEscapes(NSMutableString *s)
-{
-        [s replaceOccurrencesOfString:@"\\n" withString:@"\n" options:NSCaseInsensitiveSearch range:NSMakeRange(0, [s length])];
-        unichar nbsp = 0xA0;
-        
-        [s replaceOccurrencesOfString:@"\\h" withString:[NSString stringWithCharacters:&nbsp length:1] options:0 range: NSMakeRange(0,[s length])];
-        return s;
-}
 
 static int compare_layer(const void *a, const void *b)
@@ -306 +306 @@
                                 action setfloatnum {floatnum = [psend() floatValue];}
                                 action setstringval {strval = psend();}
+                                action nullstring {strval = @"";}
                                 action setxypos {curX=curY=-1; sscanf([psend() UTF8String], "(%d,%d)", &curX, &curY);}
                                 
@@ -346 +347 @@
                                 flag = [01] >paramset %setintnum;
                                 floatnum = ("-"? [0-9]+ ("." [0-9]*)?) >paramset %setfloatnum;
-                                string = ([^\\}]*) >paramset %setstringval;
+                                string = (([^\\}]+) >paramset %setstringval | "" %nullstring );
                                 color = ("H"|"&"){,2} (xdigit+) >paramset %sethexnum "&"?;
                                 parens = "(" [^)]* ")";
@@ -359 +360 @@
                                                         |"shad" floatnum %shadowdist
                                                         |"be" flag %bluredge
+                                                        |"blur" floatnum
                                                         |"fn" string %fontname
                                                         |"fs" floatnum %fontsize

trunk/Subtitles/SubRenderer.h

@@ -12 +12 @@
 @class SubStyle, SubContext, SubRenderDiv, SubRenderSpan;
 
-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_alpha, tag_1a, tag_2a, tag_3a, tag_4a, tag_r, tag_p} SSATagType;
+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_alpha,
+        tag_1a, tag_2a, tag_3a, tag_4a, tag_r, tag_p
+} SSATagType;
 
 #ifndef __OBJC_GC__
@@ -21 +25 @@
 #endif
 
+// XXX these should be 'id' instead of 'void*' but it makes it easier to use ATSUStyle
 @interface SubRenderer : NSObject
 -(void)completedHeaderParsing:(SubContext*)sc;
@@ -30 +35 @@
 -(void)spanChangedTag:(SSATagType)tag span:(SubRenderSpan*)span div:(SubRenderDiv*)div param:(void*)p;
 -(float)aspectRatio;
+-(NSString*)describeSpanEx:(void*)ex;
 @end

trunk/createStaticLibs.sh

@@ -155 +155 @@
         make -j3
     fi
+
+        #######################
+        # lipo/copy shlibs
+        #######################
+        BUILDDIR="$BUILT_PRODUCTS_DIR/Universal"
+        INTEL="$BUILT_PRODUCTS_DIR/intel"
+        PPC="$BUILT_PRODUCTS_DIR/ppc"
+        
+        rm -rf "$BUILDDIR"
+        mkdir "$BUILDDIR"
+        echo $buildi386 $buildppc
+        if [ $buildi386 -eq $buildppc ] ; then
+                # lipo them
+                for aa in "$INTEL"/*/*.a ; do
+                        echo lipo -create $aa `echo -n $aa | sed 's/intel/ppc/'` -output `echo -n $aa | sed 's/intel\/.*\//Universal\//'`
+                        lipo -create $aa `echo -n $aa | sed 's/intel/ppc/'` -output `echo -n $aa | sed 's/intel\/.*\//Universal\//'`
+                done
+        else
+                if [ $buildppc -gt 0 ] ; then
+                        archDir="ppc"
+                        BUILDARCHDIR=$PPC
+                else
+                        archDir="intel"
+                        BUILDARCHDIR=$INTEL
+                fi
+                # just copy them
+                for aa in "$BUILDARCHDIR"/*/*.a ; do
+                        echo cp "$aa" `echo -n $aa | sed 's/'$archDir'\/.*\//Universal\//'`
+                        cp "$aa" `echo -n $aa | sed 's/'$archDir'\/.*\//Universal\//'`
+                done
+        fi
+        echo -n "$buildid_ffmpeg" > $OUTPUT_FILE
+        
+        mkdir "$SYMROOT/Universal" || true
+        cp "$BUILT_PRODUCTS_DIR/Universal"/* "$SYMROOT/Universal"
+        ranlib "$SYMROOT/Universal"/*.a
+
 fi
-
-#######################
-# lipo/copy shlibs
-#######################
-BUILDDIR="$BUILT_PRODUCTS_DIR/Universal"
-INTEL="$BUILT_PRODUCTS_DIR/intel"
-PPC="$BUILT_PRODUCTS_DIR/ppc"
-
-rm -rf "$BUILDDIR"
-mkdir "$BUILDDIR"
-echo $buildi386 $buildppc
-if [ $buildi386 -eq $buildppc ] ; then
-    # lipo them
-    for aa in "$INTEL"/*/*.a ; do
-        echo lipo -create $aa `echo -n $aa | sed 's/intel/ppc/'` -output `echo -n $aa | sed 's/intel\/.*\//Universal\//'`
-        lipo -create $aa `echo -n $aa | sed 's/intel/ppc/'` -output `echo -n $aa | sed 's/intel\/.*\//Universal\//'`
-    done
-else
-    if [ $buildppc -gt 0 ] ; then
-        archDir="ppc"
-        BUILDARCHDIR=$PPC
-    else
-        archDir="intel"
-        BUILDARCHDIR=$INTEL
-    fi
-    # just copy them
-    for aa in "$BUILDARCHDIR"/*/*.a ; do
-        echo cp "$aa" `echo -n $aa | sed 's/'$archDir'\/.*\//Universal\//'`
-        cp "$aa" `echo -n $aa | sed 's/'$archDir'\/.*\//Universal\//'`
-    done
-fi
-echo -n "$buildid_ffmpeg" > $OUTPUT_FILE
-
-mkdir "$SYMROOT/Universal" || true
-cp "$BUILT_PRODUCTS_DIR/Universal"/* "$SYMROOT/Universal"
-ranlib "$SYMROOT/Universal"/*.a