Changeset 141

Timestamp:

10/01/06 23:41:16 (2 years ago)

Author:

dconrad

Message:

Support for uncompressed VobSub? subtitles in Matroska

Files:

• trunk/MatroskaCodecIDs.cpp (modified) (1 diff)
• trunk/MatroskaCodecIDs.h (modified) (3 diffs)
• trunk/MkvImportPrivate.cpp (modified) (2 diffs)
• trunk/MkvMovieSetup.cpp (modified) (3 diffs)
• trunk/Perian.xcodeproj/project.pbxproj (modified) (7 diffs)
• trunk/VobSubCodec.c (added)
• trunk/VobSubCodec.h (added)
• trunk/VobSubCodec.r (added)
• trunk/VobSubCodecDispatch.h (added)
• trunk/exportedSymbols (modified) (1 diff)

trunk/MatroskaCodecIDs.cpp

@@ -204 +204 @@
-}
-
+// VobSub stores the .idx file in the codec private, pass it as an .IDX extension
+ComponentResult DescExt_VobSub(KaxTrackEntry *tr_entry, SampleDescriptionHandle desc, DescExtDirection dir)
+{
+        if (!tr_entry || !desc) return paramErr;
+        ImageDescriptionHandle imgDesc = (ImageDescriptionHandle) desc;
+        
+        if (dir == kToSampleDescription) {
+                KaxCodecPrivate *codecPrivate = FindChild<KaxCodecPrivate>(*tr_entry);
+                if (codecPrivate == NULL)
+                        return invalidAtomErr;
+                
+                Handle imgDescExt = NewHandle(codecPrivate->GetSize());
+                memcpy(*imgDescExt, codecPrivate->GetBuffer(), codecPrivate->GetSize());
+                
+                AddImageDescriptionExtension(imgDesc, imgDescExt, '.IDX');
+                
+                DisposeHandle((Handle) imgDescExt);
+        }
+        return noErr;
+}
+
-ComponentResult ASBDExt_AC3(KaxTrackEntry *tr_entry, AudioStreamBasicDescription *asbd)
-{

trunk/MatroskaCodecIDs.h

@@ -158 +158 @@
-#if 0
-        { kBMPCodecType, "S_IMAGE/BMP" },
-        { kSubFormatUTF8, "S_TEXT/UTF8" },
-        { kSubFormatSSA, "S_TEXT/SSA" },
-        { kSubFormatASS, "S_TEXT/ASS" },
-        { kSubFormatUSF, "S_TEXT/USF" },
-        { kSubFormatVobSub, "S_TEXT/VOBSUB" },
-#endif
+        { kSubFormatUTF8, "S_TEXT/UTF8" },
+        { kSubFormatVobSub, "S_VOBSUB" },
-};
-
@@ -204 +204 @@
-ComponentResult DescExt_XiphVorbis(KaxTrackEntry *tr_entry, SampleDescriptionHandle desc, DescExtDirection dir);
-ComponentResult DescExt_XiphFLAC(KaxTrackEntry *tr_entry, SampleDescriptionHandle desc, DescExtDirection dir);
+ComponentResult DescExt_VobSub(KaxTrackEntry *tr_entry, SampleDescriptionHandle desc, DescExtDirection dir);
-
-struct CodecDescExtFunc {
@@ -213 +214 @@
-        { kH264CodecType, DescExt_H264 },
-        { kAudioFormatXiphVorbis, DescExt_XiphVorbis },
-
+
+
-};
-

trunk/MkvImportPrivate.cpp

@@ -523 +523 @@
-                                MkvTrackPtr mkvTrack = &priv->segments[i].tracks[j];
-                                
-
+ && mkvTrack->trackType != track_subtitle
-                                        if (mkvTrack->trackType == track_video) {
-                                                err = AddSampleTableToMedia(mkvTrack->theMedia,
@@ -624 +624 @@
-        }
-        
+        // subtitle tracks usually have gaps, so we need to add it to the track regardless
+        if (mkvTrack->trackType == track_subtitle)
+                addToTrack = true;
+        
-        if (addToTrack) {
-                if (mkvTrack->trackType == track_video) {

trunk/MkvMovieSetup.cpp

@@ -47 +47 @@
-#include <matroska/KaxTrackAudio.h>
-#include <matroska/KaxTrackVideo.h>
+#include <matroska/KaxContentEncoding.h>
-
-using namespace std;
@@ -530 +531 @@
-{
-        ComponentResult err = noErr;
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        return err;
-}
@@ -539 +608 @@
-        if (tr_codec == NULL)
-                return 0;
+        
+        // how should we handle compressed tracks?
+        KaxContentEncodings *contentEncs = FindChild<KaxContentEncodings>(*tr_entry);
+        if (contentEncs) {
+                return 'COMP';
+        }
-        
-        string codecString(*tr_codec);

trunk/Perian.xcodeproj/project.pbxproj

@@ -52 +52 @@
-                11C85FE60A64314500DF3D73 /* FFusionCodec.r in Rez */ = {isa = PBXBuildFile; fileRef = F560DF0203D622D001ABA332 /* FFusionCodec.r */; };
-                11C85FE70A64315500DF3D73 /* Perian-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 11A709DA0A3CFCB6002058D4 /* Perian-Info.plist */; };
+                6123D6260AD0A3FF003EDE52 /* VobSubCodec.c in Sources */ = {isa = PBXBuildFile; fileRef = 6123D6220AD0A3FE003EDE52 /* VobSubCodec.c */; };
+                6123D6270AD0A3FF003EDE52 /* VobSubCodec.r in Rez */ = {isa = PBXBuildFile; fileRef = 6123D6240AD0A3FE003EDE52 /* VobSubCodec.r */; };
-                61CB11200ACDF3A2007994BD /* Debug.h in Headers */ = {isa = PBXBuildFile; fileRef = 61CB11070ACDF3A2007994BD /* Debug.h */; };
-                61CB11210ACDF3A2007994BD /* EbmlBinary.h in Headers */ = {isa = PBXBuildFile; fileRef = 61CB11080ACDF3A2007994BD /* EbmlBinary.h */; };
@@ -229 +231 @@
-                11D4EFA20A3CE8C10066D45F /* libavutil.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libavutil.a; path = build/Universal/libavutil.a; sourceTree = "<group>"; };
-                11D4EFA30A3CE8C10066D45F /* libpostproc.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libpostproc.a; path = build/Universal/libpostproc.a; sourceTree = "<group>"; };
+                6123D6220AD0A3FE003EDE52 /* VobSubCodec.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = VobSubCodec.c; sourceTree = "<group>"; };
+                6123D6230AD0A3FE003EDE52 /* VobSubCodec.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = VobSubCodec.h; sourceTree = "<group>"; };
+                6123D6240AD0A3FE003EDE52 /* VobSubCodec.r */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.rez; path = VobSubCodec.r; sourceTree = "<group>"; };
+                6123D6250AD0A3FF003EDE52 /* VobSubCodecDispatch.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = VobSubCodecDispatch.h; sourceTree = "<group>"; };
-                61CB10FF0ACDF350007994BD /* libebml.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libebml.a; sourceTree = BUILT_PRODUCTS_DIR; };
-                61CB11070ACDF3A2007994BD /* Debug.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = Debug.h; path = libebml/ebml/Debug.h; sourceTree = "<group>"; };
@@ -425 +431 @@
-                        isa = PBXGroup;
-                        children = (
+                                6123D6240AD0A3FE003EDE52 /* VobSubCodec.r */,
-                                61D691590AC8E382000EFC7D /* MatroskaImport.r */,
-                                61D691540AC8E382000EFC7D /* MatroskaExport.r */,
@@ -441 +448 @@
-                        children = (
-                                61D691460AC8E333000EFC7D /* Matroska */,
+                                6123D61D0AD0A052003EDE52 /* Subtitles */,
-                                11C85ED30A641E6400DF3D73 /* ff_dataref.c */,
-                                8F483BBC0A642B3D002CCA73 /* ff_MovieImportDispatch.h */,
@@ -465 +473 @@
-                        );
-                        name = Products;
+                        sourceTree = "<group>";
+                };
+                6123D61D0AD0A052003EDE52 /* Subtitles */ = {
+                        isa = PBXGroup;
+                        children = (
+                                6123D6220AD0A3FE003EDE52 /* VobSubCodec.c */,
+                                6123D6230AD0A3FE003EDE52 /* VobSubCodec.h */,
+                                6123D6250AD0A3FF003EDE52 /* VobSubCodecDispatch.h */,
+                        );
+                        name = Subtitles;
-                        sourceTree = "<group>";
-                };
@@ -799 +817 @@
-                                11C85FE60A64314500DF3D73 /* FFusionCodec.r in Rez */,
-                                61CB12260ACE1074007994BD /* MatroskaImport.r in Rez */,
+                                6123D6270AD0A3FF003EDE52 /* VobSubCodec.r in Rez */,
-                        );
-                        runOnlyForDeploymentPostprocessing = 0;
@@ -848 +867 @@
-                                61CB120C0ACE0F8A007994BD /* DataHandlerCallback.cpp in Sources */,
-                                61CB120D0ACE0F8D007994BD /* MatroskaCodecIDs.cpp in Sources */,
+                                6123D6260AD0A3FF003EDE52 /* VobSubCodec.c in Sources */,
-                        );
-                        runOnlyForDeploymentPostprocessing = 0;

trunk/exportedSymbols

@@ -1 +1 @@
-_FFusionCodecComponentDispatch
-_FFAvi_MovieImportComponentDispatch
+_MatroskaImportComponentDispatch
+_VobSubCodecComponentDispatch