Changeset 143

Timestamp:

10/02/06 21:46:29 (2 years ago)

Author:

dconrad

Message:

Basic support for plain-text UTF-8 subtitles in Matroska (non-ASCII characters untested)

Files:

• trunk/MkvMovieSetup.cpp (modified) (1 diff)
• trunk/Perian.xcodeproj/project.pbxproj (modified) (6 diffs)
• trunk/TextSubCodec.c (added)
• trunk/TextSubCodec.h (added)
• trunk/TextSubCodec.r (added)
• trunk/TextSubCodecDispatch.h (added)
• trunk/exportedSymbols (modified) (1 diff)

trunk/MkvMovieSetup.cpp

@@ -568 +568 @@
-        } else if ((*imgDesc)->cType == kSubFormatUTF8) {
-                (*imgDesc)->width = FixedToInt(trackWidth);
-Width
+Height
-                
-        } else {

trunk/Perian.xcodeproj/project.pbxproj

@@ -54 +54 @@
-                6123D6260AD0A3FF003EDE52 /* VobSubCodec.c in Sources */ = {isa = PBXBuildFile; fileRef = 6123D6220AD0A3FE003EDE52 /* VobSubCodec.c */; };
-                6123D6270AD0A3FF003EDE52 /* VobSubCodec.r in Rez */ = {isa = PBXBuildFile; fileRef = 6123D6240AD0A3FE003EDE52 /* VobSubCodec.r */; };
+                613CD51E0AD1FB650098A825 /* TextSubCodec.c in Sources */ = {isa = PBXBuildFile; fileRef = 613CD51A0AD1FB650098A825 /* TextSubCodec.c */; };
+                613CD51F0AD1FB650098A825 /* TextSubCodec.r in Rez */ = {isa = PBXBuildFile; fileRef = 613CD51C0AD1FB650098A825 /* TextSubCodec.r */; };
-                61CB11200ACDF3A2007994BD /* Debug.h in Headers */ = {isa = PBXBuildFile; fileRef = 61CB11070ACDF3A2007994BD /* Debug.h */; };
-                61CB11210ACDF3A2007994BD /* EbmlBinary.h in Headers */ = {isa = PBXBuildFile; fileRef = 61CB11080ACDF3A2007994BD /* EbmlBinary.h */; };
@@ -235 +237 @@
-                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>"; };
+                613CD51A0AD1FB650098A825 /* TextSubCodec.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = TextSubCodec.c; sourceTree = "<group>"; };
+                613CD51B0AD1FB650098A825 /* TextSubCodec.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = TextSubCodec.h; sourceTree = "<group>"; };
+                613CD51C0AD1FB650098A825 /* TextSubCodec.r */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.rez; path = TextSubCodec.r; sourceTree = "<group>"; };
+                613CD51D0AD1FB650098A825 /* TextSubCodecDispatch.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = TextSubCodecDispatch.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>"; };
@@ -431 +437 @@
-                        isa = PBXGroup;
-                        children = (
+                                613CD51C0AD1FB650098A825 /* TextSubCodec.r */,
-                                6123D6240AD0A3FE003EDE52 /* VobSubCodec.r */,
-                                61D691590AC8E382000EFC7D /* MatroskaImport.r */,
@@ -478 +485 @@
-                        isa = PBXGroup;
-                        children = (
+                                613CD51A0AD1FB650098A825 /* TextSubCodec.c */,
+                                613CD51B0AD1FB650098A825 /* TextSubCodec.h */,
+                                613CD51D0AD1FB650098A825 /* TextSubCodecDispatch.h */,
-                                6123D6220AD0A3FE003EDE52 /* VobSubCodec.c */,
-                                6123D6230AD0A3FE003EDE52 /* VobSubCodec.h */,
@@ -818 +828 @@
-                                61CB12260ACE1074007994BD /* MatroskaImport.r in Rez */,
-                                6123D6270AD0A3FF003EDE52 /* VobSubCodec.r in Rez */,
+                                613CD51F0AD1FB650098A825 /* TextSubCodec.r in Rez */,
-                        );
-                        runOnlyForDeploymentPostprocessing = 0;
@@ -868 +879 @@
-                                61CB120D0ACE0F8D007994BD /* MatroskaCodecIDs.cpp in Sources */,
-                                6123D6260AD0A3FF003EDE52 /* VobSubCodec.c in Sources */,
+                                613CD51E0AD1FB650098A825 /* TextSubCodec.c in Sources */,
-                        );
-                        runOnlyForDeploymentPostprocessing = 0;

trunk/exportedSymbols

@@ -3 +3 @@
-_MatroskaImportComponentDispatch
-_VobSubCodecComponentDispatch
+_TextSubCodecComponentDispatch