Changeset 158

Timestamp:

10/13/06 19:07:19 (2 years ago)

Author:

dconrad

Message:

Load external SubRip? (.srt) files. Closes #39

Files:

• trunk/MatroskaImport.c (modified) (2 diffs)
• trunk/MkvMovieSetup.cpp (modified) (4 diffs)
• trunk/Perian.xcodeproj/project.pbxproj (modified) (7 diffs)
• trunk/SubImport.c (added)
• trunk/SubImport.h (added)
• trunk/ff_MovieImport.c (modified) (3 diffs)

trunk/MatroskaImport.c

@@ -37 +37 @@
-#include "MatroskaImport.h"
-#include "MkvImportPrivate.h"
+#include "SubImport.h"
-
-#pragma mark- Component Dispatch
@@ -138 +139 @@
-                                                        inFlags,
-                                                        outFlags);
-
+
+
+
+
-bail:
-        if (store->filename)

trunk/MkvMovieSetup.cpp

@@ -26 +26 @@
-#include "MkvImportPrivate.h"
-#include "MkvMovieSetup.h"
+#include "SubImport.h"
-#include <QuickTime/QuickTime.h>
-#include <AudioToolbox/AudioToolbox.h>
@@ -541 +542 @@
-        ComponentResult err = noErr;
-        Fixed trackWidth, trackHeight;
-        Fixed horizontalOffset, verticalOffset;
-        Rect movieBox;
-        MediaHandler mh;
@@ -575 +575 @@
-                (*imgDesc)->height = height;
-                
+                mkvTrack->theTrack = NewMovieTrack(theMovie, trackWidth, trackHeight, kNoVolume);
+                if (mkvTrack->theTrack == NULL) {
+                        err = GetMoviesError();
+                        goto bail;
+                }
+                
+                mkvTrack->theMedia = NewTrackMedia(mkvTrack->theTrack, VideoMediaType, GetMovieTimeScale(theMovie), dataRef, dataRefType);
+                if (mkvTrack->theMedia == NULL) {
+                        err = GetMoviesError();
+                        goto bail;
+                }
+                
+                // finally, say that we're transparent
+                mh = GetMediaHandler(mkvTrack->theMedia);
+                MediaSetGraphicsMode(mh, graphicsModePreWhiteAlpha, NULL);
+                
-        } else if ((*imgDesc)->cType == kSubFormatUTF8) {
-
-
+
+
+
+
+
+
+
-                
-        } else {
@@ -584 +605 @@
-        }
-        
-        mkvTrack->theTrack = NewMovieTrack(theMovie, trackWidth, trackHeight, kNoVolume);
-        if (mkvTrack->theTrack == NULL) {
-                err = GetMoviesError();
-                goto bail;
-        }
-        
-        mkvTrack->theMedia = NewTrackMedia(mkvTrack->theTrack, VideoMediaType, 
-                                                                           GetMovieTimeScale(theMovie), dataRef, dataRefType);
-        if (mkvTrack->theMedia == NULL) {
-                err = GetMoviesError();
-                goto bail;
-        }
-        
-        // this sets up anything else needed in the description for the specific codec.
-        FinishSampleDescription(tr_entry, (SampleDescriptionHandle) imgDesc);
-        
-        // finally, say that we're transparent
-        mh = GetMediaHandler(mkvTrack->theMedia);
-        MediaSetGraphicsMode(mh, graphicsModePreWhiteAlpha, NULL);
-        
-        // and save our sample description

trunk/Perian.xcodeproj/project.pbxproj

@@ -161 +161 @@
-                61CB120D0ACE0F8D007994BD /* MatroskaCodecIDs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 61D691500AC8E382000EFC7D /* MatroskaCodecIDs.cpp */; };
-                61CB12260ACE1074007994BD /* MatroskaImport.r in Rez */ = {isa = PBXBuildFile; fileRef = 61D691590AC8E382000EFC7D /* MatroskaImport.r */; };
+                61D514DE0ADF3DBA00A671E1 /* SubImport.c in Sources */ = {isa = PBXBuildFile; fileRef = 61D514DD0ADF3DBA00A671E1 /* SubImport.c */; };
+                61D517730AE0402E00A671E1 /* CommonUtils.c in Sources */ = {isa = PBXBuildFile; fileRef = 61D517720AE0402E00A671E1 /* CommonUtils.c */; };
-                8F483B550A642644002CCA73 /* libavformat.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 8F483B540A642644002CCA73 /* libavformat.a */; };
-                8F483B5E0A6426C1002CCA73 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8F483B5D0A6426C1002CCA73 /* AudioToolbox.framework */; };
@@ -340 +342 @@
-                61CB11CA0ACDF50F007994BD /* KaxTrackVideo.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = KaxTrackVideo.cpp; path = libmatroska/src/KaxTrackVideo.cpp; sourceTree = "<group>"; };
-                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>"; };
+                61D514DD0ADF3DBA00A671E1 /* SubImport.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SubImport.c; sourceTree = "<group>"; };
+                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>"; };
-                61D6914E0AC8E382000EFC7D /* DataHandlerCallback.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = DataHandlerCallback.cpp; sourceTree = "<group>"; };
-                61D6914F0AC8E382000EFC7D /* DataHandlerCallback.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DataHandlerCallback.h; sourceTree = "<group>"; };
@@ -422 +428 @@
-                        isa = PBXGroup;
-                        children = (
+                                61CB11020ACDF37C007994BD /* libebml */,
+                                61CB11720ACDF4BB007994BD /* libmatroska */,
-                                8F483B5D0A6426C1002CCA73 /* AudioToolbox.framework */,
-                                1156DBD80A3CE9F500963B0E /* libz.dylib */,
@@ -468 +476 @@
-                                113F58980A6B091600509987 /* Codecprintf.h */,
-                                113F58990A6B091600509987 /* Codecprintf.c */,
+                                61D517710AE0402E00A671E1 /* CommonUtils.h */,
+                                61D517720AE0402E00A671E1 /* CommonUtils.c */,
-                        );
-                        name = Source;
@@ -491 +501 @@
-                                6123D6230AD0A3FE003EDE52 /* VobSubCodec.h */,
-                                6123D6250AD0A3FF003EDE52 /* VobSubCodecDispatch.h */,
+                                61D514DC0ADF3DBA00A671E1 /* SubImport.h */,
+                                61D514DD0ADF3DBA00A671E1 /* SubImport.c */,
-                        );
-                        name = Subtitles;
@@ -609 +621 @@
-                        isa = PBXGroup;
-                        children = (
-                                61CB11020ACDF37C007994BD /* libebml */,
-                                61CB11720ACDF4BB007994BD /* libmatroska */,
-                                61D6916B0AC8E3A3000EFC7D /* Import */,
-                                61D6916C0AC8E3C5000EFC7D /* Export */,
@@ -880 +890 @@
-                                6123D6260AD0A3FF003EDE52 /* VobSubCodec.c in Sources */,
-                                613CD51E0AD1FB650098A825 /* TextSubCodec.c in Sources */,
+                                61D514DE0ADF3DBA00A671E1 /* SubImport.c in Sources */,
+                                61D517730AE0402E00A671E1 /* CommonUtils.c in Sources */,
-                        );
-                        runOnlyForDeploymentPostprocessing = 0;

trunk/ff_MovieImport.c

@@ -27 +27 @@
-#include "Codecprintf.h"
-#include "riff.h"
+#include "SubImport.h"
-
-/* This one is a little big in ffmpeg and private anyway */
@@ -340 +341 @@
-        Handle dataRef = NULL;
-        OSType dataRefType;
+        FSRef theFileFSRef;
-        
-        *outFlags = 0;
@@ -348 +350 @@
-        result = MovieImportDataRef(storage->ci, dataRef, dataRefType, theMovie, targetTrack, usedTrack, atTime, addedDuration,
-                                                                inFlags, outFlags);
+        require_noerr(result, bail);
+        
+        result = FSpMakeFSRef(theFile, &theFileFSRef);
+        require_noerr(result, bail);
+        
+        LoadExternalSubtitles(&theFileFSRef, theMovie);
+        
-bail:
-                if(dataRef)