Changeset 343

Timestamp:

02/15/07 15:11:35 (2 years ago)

Author:

astrange

Message:

Allow negative numbers in SSA tags, and be more forgiving about weird color syntax.
Remove some old debugging prints. Fix serializer when the second-to-last line ends after the last one.

Files:

• trunk/SSADocument.m (modified) (1 diff)
• trunk/SSARenderCodec.m (modified) (5 diffs)
• trunk/SSATagParsing.m.rl (modified) (1 diff)
• trunk/SubImport.mm (modified) (7 diffs)

trunk/SSADocument.m

@@ -551 +551 @@
-
-                err=AddMediaSample(theMedia,sampleHndl,0,sampleLen, p->end_time - p->begin_time,(SampleDescriptionHandle)textDesc, 1, 0, &sampleTime);
-NSLog(@"error adding %d-%d",p->begin_time, p->end_time); err = GetMoviesError(
+err = GetMoviesError(); NSLog(@"external SSA: error %d adding %d-%d line",err, p->begin_time, p->end_time
-                
-                ConvertTimeScale(&movieStartTime, movieTimeScale);
-
-                err = InsertMediaIntoTrack(theTrack, movieStartTime.value.lo, sampleTime, p->end_time - p->begin_time, fixed1);
-err = GetMoviesError(); goto bail
+goto loopend
-
-loopend:
+                err = noErr;
-                DisposeHandle(sampleHndl);
-        }

trunk/SSARenderCodec.m

@@ -68 +68 @@
-                OSStatus err;
-                
-                //[[NSColor redColor] set];
-                //NSBezierPath *path = [NSBezierPath bezierPath];
-                err=ATSUGetGlyphBounds(re->layout,baseX,FloatToFixed(iheight) - baseY,breaks[i],end-breaks[i],kATSUseDeviceOrigins,1,&trap,&trapCount);
-                
@@ -76 +74 @@
-                
-                baseY += ascent + descent;
-
-
-
-
-
-
-
-
+
-                rect.bottom = MAX(trap.lowerLeft.y, trap.lowerRight.y);
-                rect.left = MIN(trap.lowerLeft.x, trap.upperLeft.x);
@@ -166 +157 @@
-                                        break;
-                                case S_MiddleAlign: // center
-cHeight
+ssa->resY
-                                        lstart = 0; lend = breakCount+1; lstep = 1;
-                                        storePenY = &lastCenterPenY;
@@ -185 +176 @@
-                        GetTypographicRectangleForLayout(re,breaks,breakCount,&imageHeight,&imageWidth,penX,penY,ssa->resY);
-                        
-                        storePenY = &ignoredPenY;
-                        penX = IntToFixed(re->posx);
-                        penY = FloatToFixed((ssa->resY - re->posy));
-
-
-
-
-
-
-
-
-
-
-
+
-                        switch(re->halign) {
-                                case S_CenterAlign:
@@ -217 +197 @@
-                        direction = 1;
-                        lstart = breakCount; lend = -1; lstep = -1;
+                        storePenY = &ignoredPenY;
-                }
-                

trunk/SSATagParsing.m.rl

@@ -541 +541 @@
-                                
-                                flag = ([01] % {unichar fl = *(p-1); if (flag == '0' || flag == '1') flag = fl - '0';})? > {flag = 1;};
-digit+
+"-"? digit*
-                                num = num_ > {numbegin = p;} % {num = [[NSString stringWithCharacters:numbegin length:p-numbegin] doubleValue];};
-                                
-digit*
-
-"&H" xdigit*
+"-"? (digit*)
+
+("H"|"&"){,2} (xdigit*)
-
-                                cmd_specific = (("pos(" [^)]+ > pos_begin ")" % pos_end)

trunk/SubImport.mm

@@ -12 +12 @@
-#import "Categories.h"
-#include "CommonUtils.h"
+
+//#define SS_DEBUG
-
-// if the subtitle filename is something like title.en.srt or movie.fre.srt
@@ -405 +407 @@
-        unsigned min_allowed = finished ? 1 : 2;
-        if (num < min_allowed) return;
-+1
+
-        SubLine *slines[num], *last=nil;
-        bool last_has_invalid_end = false, all_overlap = true;
@@ -411 +413 @@
-        [lines sortUsingFunction:cmp_line context:nil];
-        [lines getObjects:slines];
-
-
+
+
+
-        //leave early if all subtitle lines overlap
-        if (!finished) {
@@ -436 +439 @@
-                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 string]
-slines[num-1]->begin_time
-startedOutput = false, finishedOutput
+nil
+times[num*2-1]
+finishedOutput = false, is_last_line
-                
-                // 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
-i >= (num*2)-2) finishedOutput = true; 
+(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)) {
-                                unsigned ns = slines[j]->end_time;
-                                
-                                // find the next line that starts after this one
-
+
+
-                                        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);
-
-
-
+
-                        } else if (j == num-1) finishedOutput = true;
-                }
-                                
-finishedOutput && start
+accum && finish
-                        [accum deleteCharactersInRange:NSMakeRange([accum length] - 1, 1)]; // delete last newline
-
+
+
+
-                        if (last_has_invalid_end) {
-                                if (last_end < next_start) { 
@@ -479 +482 @@
-                        end = last_end;
-                        last_has_invalid_end = false;
-
+ && !is_last_line
-                        SubLine *event = [[SubLine alloc] initWithLine:accum start:start end:end];
-                        
@@ -492 +495 @@
-                last->end_time = slines[num-1]->begin_time;
-        }
-
-
+
+
+
+
-        if (finished) [lines removeAllObjects];
-        else {
@@ -502 +507 @@
-                }
-        }
-
+
+
+
-}
-