Changeset 330

Timestamp:

02/06/07 13:08:02 (2 years ago)

Author:

astrange

Message:

Generalize subtitle overlap handling, apply to external .srt files.

Files:

• trunk/Perian.xcodeproj/project.pbxproj (modified) (4 diffs)
• trunk/SSADocument.h (modified) (3 diffs)
• trunk/SSADocument.m (modified) (6 diffs)
• trunk/SubImport.h (modified) (1 diff)
• trunk/SubImport.mm (moved) (moved from trunk/SubImport.c) (9 diffs)

trunk/Perian.xcodeproj/project.pbxproj

@@ -226 +226 @@
-                61CB120D0ACE0F8D007994BD /* MatroskaCodecIDs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 61D691500AC8E382000EFC7D /* MatroskaCodecIDs.cpp */; };
-                61CB12260ACE1074007994BD /* MatroskaImport.r in Rez */ = {isa = PBXBuildFile; fileRef = 61D691590AC8E382000EFC7D /* MatroskaImport.r */; };
-c in Sources */ = {isa = PBXBuildFile; fileRef = 61D514DD0ADF3DBA00A671E1 /* SubImport.c
+mm in Sources */ = {isa = PBXBuildFile; fileRef = 61D514DD0ADF3DBA00A671E1 /* SubImport.mm
-                61D517730AE0402E00A671E1 /* CommonUtils.c in Sources */ = {isa = PBXBuildFile; fileRef = 61D517720AE0402E00A671E1 /* CommonUtils.c */; };
-                61FD41330B4F6F0800BEEFEA /* MatroskaImportPrivate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 61FD41320B4F6F0800BEEFEA /* MatroskaImportPrivate.cpp */; };
@@ -582 +582 @@
-                61CB11CB0ACDF50F007994BD /* KaxVersion.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = KaxVersion.cpp; path = libmatroska/src/KaxVersion.cpp; sourceTree = "<group>"; };
-                61D514DC0ADF3DBA00A671E1 /* SubImport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SubImport.h; sourceTree = "<group>"; };
-c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SubImport.c
+mm */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 4; path = SubImport.mm
-                61D517710AE0402E00A671E1 /* CommonUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CommonUtils.h; sourceTree = "<group>"; };
-                61D517720AE0402E00A671E1 /* CommonUtils.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = CommonUtils.c; sourceTree = "<group>"; };
@@ -880 +880 @@
-                                6123D6250AD0A3FF003EDE52 /* VobSubCodecDispatch.h */,
-                                61D514DC0ADF3DBA00A671E1 /* SubImport.h */,
-c
+mm
-                                3DB2BB270B6C92F000416863 /* SSARenderCodec.h */,
-                                3DB2BB280B6C92F000416863 /* SSARenderCodec.m */,
@@ -1503 +1503 @@
-                                6123D6260AD0A3FF003EDE52 /* VobSubCodec.c in Sources */,
-                                613CD51E0AD1FB650098A825 /* TextSubCodec.c in Sources */,
-c
+mm
-                                61D517730AE0402E00A671E1 /* CommonUtils.c in Sources */,
-                                6116E5510B43C27B0020F1CE /* ACBaseCodec.cpp in Sources */,

trunk/SSADocument.h

@@ -20 +20 @@
-
-#import <Cocoa/Cocoa.h>
+#import "SubImport.h"
-
-enum {S_LeftAlign = 0, S_CenterAlign, S_RightAlign};
@@ -43 +44 @@
-} ssastyleline;
-
-@interface SSAEvent : NSObject
-{
-        @public
-        NSString *line;
-        unsigned begin_time, end_time;
-}
-@end
-
-@interface SSADocument : NSObject {
-        NSArray *_lines;
@@ -68 +61 @@
-}
--(NSString *)header;
-SAEvent
+ubLine
--(void) loadHeader:(NSString*)path width:(float)width height:(float)height;
--(unsigned)packetCount;

trunk/SSADocument.m

@@ -22 +22 @@
-#import "Categories.h"
-#include "SubImport.h"
-
-@implementation SSAEvent
--(void)dealloc
-{
-        [line release];
-        [super dealloc];
-}
-@end
-
-@implementation SSADocument
@@ -243 +235 @@
-}
-
-SAEvent
+ubLine
-{
-        return [_lines objectAtIndex:i];
@@ -276 +268 @@
-}
-
-static int cmp_uint(const void *a, const void *b)
-{
-        unsigned av = *(unsigned*)a, bv = *(unsigned*)b;
-        
-        if (av > bv) return 1;
-        if (av < bv) return -1;
-        return 0;
-}
-
-typedef struct {
-        NSString *line;
-        unsigned start, end;
-} line_range;
-
-static int cmp_line(const void *a, const void *b)
-{
-        const line_range *av = a, *bv = b;
-        
-        if (av->start > bv->start) return 1;
-        if (av->start < bv->start) return -1;
-        return 0;
-}
-
--(NSArray *)serializeSubLines:(NSMutableArray*)linesa
-{
-
-
-
-
+
-        NSMutableArray *outa = [[NSMutableArray alloc] init];
+        SubtitleSerializer *serializer = [[SubtitleSerializer alloc] init];
+        SubLine *sl;
-        
-        for (i = 0; i < num; i++) {
-
+ = [linesa objectAtIndex:i];
-                NSString *s,*e;
-
-
+
-                
-                s = [l objectForKey:@"Start"];
-                e = [l objectForKey:@"End"];
-                
-
-
-
+
-                
-                if (timescale != 1.) {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        return outa;
-}
@@ -600 +542 @@
-        
-        for (i = 0; i < packetCount; i++) {
-SAEvent
+ubLine
-                TimeRecord movieStartTime = {SInt64ToWide(p->begin_time), 100, 0};
-                TimeValue sampleTime;
@@ -619 +561 @@
-        }
-        
+        sampleHndl = NULL;
+        
-        EndMediaEdits(theMedia);
-        
@@ -645 +589 @@
-        
-        if (headerHndl) DisposeHandle((Handle)headerHndl);
+        if (sampleHndl) DisposeHandle(sampleHndl);
-        DisposeHandle((Handle)drefHndl);
-        

trunk/SubImport.h

@@ -30 +30 @@
-#endif
-
+#ifdef __OBJC__
+#import <Cocoa/Cocoa.h>
+
+@interface SubLine : NSObject
+{
+        @public
+        NSString *line;
+        unsigned begin_time, end_time;
+}
+-(id)initWithLine:(NSString*)l start:(unsigned)s end:(unsigned)e;
+@end
+
+@interface SubtitleSerializer : NSObject
+{
+        NSMutableArray *lines, *outpackets;
+        BOOL finished;
+}
+-(void)addLine:(SubLine *)sline;
+-(void)addLineWithString:(NSString*)string start:(unsigned)start end:(unsigned)end;
+-(void)setFinished:(BOOL)finished;
+-(SubLine*)getSerializedPacket;
+@end
-#endif
+
+#endif

trunk/SubImport.mm

@@ -9 +9 @@
-
-#include <QuickTime/QuickTime.h>
-
+
+
-#include "CommonUtils.h"
-
@@ -92 +93 @@
-}
-
-
+"C" 
-
-ComponentResult LoadSubRipSubtitles(const FSRef *theDirectory, CFStringRef filename, Movie theMovie, Track *firstSubTrack)
-{
+        NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+        SubtitleSerializer *serializer = [[SubtitleSerializer alloc] init];
-        ComponentResult err = noErr;
-        Handle dataRef = NULL;
-        OSType dataRefType = rAliasType;
-        HFSUniStr255 hfsFilename;
-        CFRange filenameLen;
-        Track theTrack = NULL;
-        Media theMedia = NULL;
-        Rect movieBox;
-
-ComponentInstance dataHandler = NULL
-long filePos = 0
-
-
+
+TimeScale movieTimeScale = GetMovieTimeScale(theMovie)
+UInt32 emptyDataRefExtension[2]
+
+onst c
-        ImageDescriptionHandle textDesc = (ImageDescriptionHandle) NewHandleClear(sizeof(ImageDescription));
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        GetMovieBox(theMovie, &movieBox);
-
-
-
+
-        if (theTrack == NULL) {
-                err = GetMoviesError();
@@ -155 +141 @@
-        }
-
-        unsigned int subNum = 1;
-        char subNumStr[10];
-
-printf(subNumStr
+nprintf(subNumStr, 10
-        char *subOffset = strstr(data, subNumStr);
-
@@ -177 +162 @@
-                // find the next subtitle
-                // setting subOffset to point the end of the current subtitle text
-printf(subNumStr
+nprintf(subNumStr, 10
-                subOffset = strstr(subTimecodeOffset, subNumStr);
-
@@ -185 +170 @@
-
-                        TimeValue startTime = startmsec + 1000*startsec + 60*1000*startmin + 60*60*1000*starthour;
-
-
-
+
-
-                        if (subOffset != NULL) {
-duration > 0
+endTime > startTime
-                                {
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-                                }
-
@@ -211 +190 @@
-                }
-        }
+        
+        [serializer setFinished:YES];
+        
+        BeginMediaEdits(theMedia);
+        
+        while (sl = [serializer getSerializedPacket]) {
+                TimeRecord movieStartTime = {SInt64ToWide(sl->begin_time), 1000, 0};
+                TimeValue sampleTime;
+                const char *str = [sl->line UTF8String];
+                size_t sampleLen = strlen(str);
+                
+                PtrToHand(str,&sampleHndl,sampleLen);
+                
+                err=AddMediaSample(theMedia,sampleHndl,0,sampleLen, sl->end_time - sl->begin_time,(SampleDescriptionHandle)textDesc, 1, 0, &sampleTime);
+                if (err != noErr) goto bail;
+                
+                ConvertTimeScale(&movieStartTime, movieTimeScale);
+                
+                err = InsertMediaIntoTrack(theTrack, movieStartTime.value.lo, sampleTime, sl->end_time - sl->begin_time, fixed1);
+                if (err != noErr) goto bail;
+                
+                DisposeHandle(sampleHndl);
+        }
+
+        sampleHndl = NULL;
-
-        if (*firstSubTrack == NULL)
@@ -220 +224 @@
-
-bail:
+        [serializer release];
+        [pool release];
-        if (err) {
-                if (theMedia)
@@ -231 +237 @@
-                DisposeHandle((Handle) textDesc);
-
-
-
-
-
-
+
+
+
-
-        return err;
@@ -331 +335 @@
-        return err;
-}
+
+@implementation SubtitleSerializer
+-(id)init
+{
+        if (self = [super init]) {
+                lines = [[NSMutableArray alloc] init];
+                outpackets = [[NSMutableArray alloc] init];
+                finished = NO;
+        }
+        
+        return self;
+}
+
+-(void)addLine:(SubLine *)sline
+{
+        [lines addObject:sline];
+}
+
+-(void)addLineWithString:(NSString*)string start:(unsigned)start end:(unsigned)end
+{
+        SubLine *sl = [[[SubLine alloc] init] autorelease];
+        
+        sl->line = [string retain];
+        sl->begin_time = start;
+        sl->end_time = end;
+        
+        [lines addObject:sl];
+}
+
+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 NSOrderedDescbegining;
+        if (av->begin_time < bv->begin_time) return NSOrderedAscbegining;
+        return NSOrderedSame;
+}
+
+static int cmp_uint(const void *a, const void *b)
+{
+        unsigned av = *(unsigned*)a, bv = *(unsigned*)b;
+        
+        if (av > bv) return 1;
+        if (av < bv) return -1;
+        return 0;
+}
+
+static bool isinrange(unsigned base, unsigned test_s, unsigned test_e)
+{
+        return (base >= test_s) && (base < test_e);
+}
+
+/* FIXME: This algorithm is not nearly good enough.
+   It works for trivial overlaps, but not [  [   ]   [   ]  ] (where [] are subtitle lines).
+   Many other cases may fail. */
+
+-(void)refill
+{
+        unsigned num = [lines count];
+        unsigned times[num*2+1];
+        SubLine *slines[num];
+        
+        [lines sortUsingFunction:cmp_line context:nil];
+        [lines getObjects:slines];
+        //NSLog(@"%@",lines);
+        for (int i=0;i < num;i++) {
+                times[i*2]   = slines[i]->begin_time;
+                times[i*2+1] = slines[i]->end_time;
+        }
+        
+        times[num * 2] = times[num * 2 - 1];
+        
+        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 = [NSMutableString string];
+                unsigned start = times[i], end = times[i+1];
+                bool startedOutput = false, finishedOutput = 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 && i >= (num*2)-2) finishedOutput = true; 
+                        
+                for (int j=0; j < num; j++) {
+                        if (isinrange(times[i], slines[j]->begin_time, slines[j]->end_time)) {
+                                [accum appendString:slines[j]->line];
+                                startedOutput = true;
+                        } else if (startedOutput) {finishedOutput = true; break;}
+                }
+                
+                
+                if (finishedOutput && startedOutput) {
+                        [accum deleteCharactersInRange:NSMakeRange([accum length] - 1, 1)]; // delete last newline
+                        SubLine *event = [[[SubLine alloc] initWithLine:accum start:start end:end] autorelease];
+                        
+                        [outpackets addObject:event];
+                }
+        }
+        
+        //NSLog(@"%@",outpackets);
+
+        [lines removeAllObjects];
+        if (!finished) [lines addObject:slines[num-1]]; //keep the last packet in the queue
+}
+
+-(SubLine*)getSerializedPacket
+{
+        if ([outpackets count] == 0) [self refill];
+        if ([outpackets count] == 0) return nil;
+        
+        SubLine *sl = [outpackets objectAtIndex:0];
+        [outpackets removeObjectAtIndex:0];
+        
+        return sl;
+}
+
+-(void)setFinished:(BOOL)f
+{
+        finished = f;
+}
+@end
+
+@implementation SubLine
+-(id)initWithLine:(NSString*)l start:(unsigned)s end:(unsigned)e
+{
+        if (self = [super init]) {
+                line = [l retain];
+                begin_time = s;
+                end_time = e;
+        }
+        
+        return self;
+}
+
+-(void)dealloc
+{
+        [line release];
+        [super dealloc];
+}
+
+-(NSString*)description
+{
+        return [NSString stringWithFormat:@"\"%@\", %d -> %d",line,begin_time,end_time];
+}
+@end