Changeset 311

Timestamp:

01/28/07 00:44:15 (2 years ago)

Author:

astrange

Message:

Import SSA via a temporary movie file.
This actually works.

(Creates one file per SSA subtitle opened, which persists until reboot.)

Files:

• trunk/MatroskaImportPrivate.cpp (modified) (1 diff)
• trunk/SSADocument.m (modified) (6 diffs)
• trunk/SubImport.c (modified) (5 diffs)
• trunk/SubImport.h (modified) (1 diff)

trunk/MatroskaImportPrivate.cpp

@@ -456 +456 @@
-                
-        } else if ((*imgDesc)->cType == kSubFormatUTF8) {
-
+
+
+
-                if (mkvTrack.theTrack == NULL)
-                        return GetMoviesError();

trunk/SSADocument.m

@@ -473 +473 @@
-@end
-
+//based on Apple sample code http://developer.apple.com/samplecode/QTKitCreateMovie/listing5.html
+
+static Movie CreateQuicktimeMovieFromTempFile(DataHandler * outDataHandler, OSErr *outErr, NSString **movieName)
+{
+        *outErr = -1;
+        char *c_tempName = tempnam(NULL,"perian-subtitle-");
+        
+        // generate a name for our movie file
+        NSString *tempName = [NSString stringWithCString:c_tempName 
+                                                                                        encoding:[NSString defaultCStringEncoding]];
+        if (nil == tempName) goto nostring;
+        free(c_tempName);
+        
+        Handle  dataRefH    = nil;
+        OSType  dataRefType;
+        
+        // create a file data reference for our movie
+        *outErr = QTNewDataReferenceFromFullPathCFString((CFStringRef)tempName,
+                                                                                                         kQTNativeDefaultPathStyle,
+                                                                                                         0,
+                                                                                                         &dataRefH,
+                                                                                                         &dataRefType);
+        if (*outErr != noErr) goto nodataref;
+        
+        // create a QuickTime movie from our file data reference
+        Movie  qtMovie  = nil;
+        CreateMovieStorage (dataRefH,
+                                                dataRefType,
+                                                'TVOD',
+                                                smSystemScript,
+                                                newMovieActive, 
+                                                outDataHandler,
+                                                &qtMovie);
+        *outErr = GetMoviesError();
+        if (*outErr != noErr) goto cantcreatemovstorage;
+        
+        return qtMovie;
+        
+        // error handling
+cantcreatemovstorage:
+                DisposeHandle(dataRefH);
+nodataref:
+nostring:
+                
+                return nil;
+}
+
+/*
+ We import SSA by creating a temporary movie, adding samples to it, and copying it to the current movie, which can't have samples added to it as it's read-only.
+ 
+ I tried to use an in-memory temporary, but it completely failed to work.
+ 
+ This works except for saving reference movies, which include a dependency on the temporary file. They will break when it's deleted upon restart.
+ I don't see any apparent workaround.
+ */
-ComponentResult LoadSubStationAlphaSubtitles(const FSRef *theDirectory, CFStringRef filename, Movie theMovie, Track *firstSubTrack)
-{
-        ComponentResult err = noErr;
-
-
-
-
-
-
+
+
-        NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
-        SSADocument *ssa = [[SSADocument alloc] init];
-        static UInt8 path[PATH_MAX];
-
-
-
-
+
-        char *data = NULL; const char *header;
-        int i, packetCount, sampleLen;
-        ImageDescriptionHandle textDesc;
+        DataHandler tempStor;
+        Movie tempMovie;
+        OSErr oErr;
+        NSString *movieName;
+        Rect movieBox;
-        
-        FSRefMakePath(theDirectory, path, PATH_MAX);
@@ -505 +558 @@
-        PtrToHand(header, &headerHndl, sampleLen);
-        
-
-
-
+
+
+
+
+
-        if (theTrack == NULL) {
-                err = GetMoviesError();
-                goto bail;
-        }
-
-
-
+
-        theMedia = GetTrackMedia(theTrack);
-        if (theMedia == NULL) {
@@ -522 +575 @@
-        
-        BeginMediaEdits(theMedia);
-
+
-        for (i = 0; i < packetCount; i++) {
-                SSAEvent *p = [ssa movPacket:i];
+                TimeRecord movieStartTime = { SInt64ToWide(p->begin_time), 100, 0 };
-                const char *str = [p->line UTF8String];
-                sampleLen = strlen(str);
@@ -531 +585 @@
-
-                err=AddMediaSample(theMedia,sampleHndl,0,sampleLen, p->end_time - p->begin_time,(SampleDescriptionHandle)textDesc, 1, 0, NULL);
-
-
-
-
+
-
-                DisposeHandle(sampleHndl);
@@ -541 +592 @@
-        EndMediaEdits(theMedia);
-                
+        InsertMediaIntoTrack(theTrack,0,0,GetMediaDuration(theMedia),fixed1);
+        if (err != noErr) {goto bail;}
+
+        track2 = CreatePlaintextSubTrack(theMovie, textDesc, 100, NULL, 0, kSubFormatSSA, headerHndl, movieBox);
+        
+        media2 = GetTrackMedia(track2);
+        
+        BeginMediaEdits(media2);
+        err=InsertTrackSegment(theTrack,track2,0,GetTrackDuration(theTrack),0);
+        EndMediaEdits(media2);
+        
+        
-        if (*firstSubTrack == NULL)
-heTrack
+rack2
-        else
-heTrack
-
-theMedia
+rack2
+
+media2
-        
-bail:
-                
-        [ssa release];
-        [pool release];
-        
-        if (err) {
@@ -565 +625 @@
-        
-        if (headerHndl) DisposeHandle((Handle)headerHndl);
-
-
+
+
+
+
+
+
+
-        
-        return err;

trunk/SubImport.c

@@ -58 +58 @@
-
-Track CreatePlaintextSubTrack(Movie theMovie, ImageDescriptionHandle imgDesc, 
-
-
-
+
+
-        Fixed trackWidth, trackHeight;
-        Track theTrack;
@@ -66 +65 @@
-
-        // plain text subs have no size on their own
-        GetMovieBox(theMovie, &movieBox);
-        trackWidth = IntToFixed(movieBox.right - movieBox.left);
-        trackHeight = IntToFixed(movieBox.bottom - movieBox.top);
@@ -78 +76 @@
-        (*imgDesc)->clutID = -1;
-
+        if (imageExtension) AddImageDescriptionExtension(imgDesc, imageExtension, subType);
+
-        theTrack = NewMovieTrack(theMovie, trackWidth, trackHeight, kNoVolume);
-        if (theTrack != NULL) {
@@ -103 +103 @@
-        Track theTrack = NULL;
-        Media theMedia = NULL;
+        Rect movieBox;
-
-        ComponentInstance dataHandler = NULL;
@@ -139 +140 @@
-        data[fileSize] = '\0';
-
+        GetMovieBox(theMovie, &movieBox);
+
-        // millisecond accuracy
-
+, NULL, movieBox
-        if (theTrack == NULL) {
-                err = GetMoviesError();

trunk/SubImport.h

@@ -22 +22 @@
-
-Track CreatePlaintextSubTrack(Movie theMovie, ImageDescriptionHandle imgDesc, 
-
+
+
+
-
-#ifdef __cplusplus