Changeset 323

Timestamp:

02/02/07 00:39:58 (2 years ago)

Author:

dconrad

Message:

Use attached fonts in Matroska

Files:

• trunk/MatroskaImport.h (modified) (2 diffs)
• trunk/MatroskaImportPrivate.cpp (modified) (3 diffs)

trunk/MatroskaImport.h

@@ -36 +36 @@
-#include <matroska/KaxChapters.h>
-#include <matroska/KaxBlock.h>
+#include <matroska/KaxAttachments.h>
-
-using namespace libmatroska;
@@ -156 +157 @@
-        void ReadChapters(KaxChapters &chapterEntries);
-        
+        // Activates any attached fonts, ignores other attachment types for now
+        void ReadAttachments(KaxAttachments &attachments);
+        
-        // These three are called from ReadTracks to set up a track of the specific type, 
-        // modifying the MatroskaTrack structure to reflect the newly create track. 

trunk/MatroskaImportPrivate.cpp

@@ -39 +39 @@
-#include <matroska/KaxCluster.h>
-#include <matroska/KaxBlock.h>
+#include <matroska/KaxAttachments.h>
+#include <matroska/KaxAttached.h>
-
-#include "MatroskaImport.h"
@@ -114 +116 @@
-                        el_l1->Read(*aStream, KaxChapters::ClassInfos.Context, upperLevel, dummyElt, true);
-                        ReadChapters(*static_cast<KaxChapters *>(el_l1));
+                        
+                } else if (EbmlId(*el_l1) == KaxAttachments::ClassInfos.GlobalId) {
+                        el_l1->Read(*aStream, KaxAttachments::ClassInfos.Context, upperLevel, dummyElt, true);
+                        ReadAttachments(*static_cast<KaxAttachments *>(el_l1));
-                        
-                } else if (EbmlId(*el_l1) == KaxCluster::ClassInfos.GlobalId) {
@@ -568 +574 @@
-}
-
+void MatroskaImport::ReadAttachments(KaxAttachments &attachments)
+{
+        KaxAttached *attachedFile = FindChild<KaxAttached>(attachments);
+        
+        while (attachedFile && attachedFile->GetSize() > 0) {
+                string fileMimeType = GetChild<KaxMimeType>(*attachedFile);
+                
+                if (fileMimeType == "application/x-truetype-font") {
+                        KaxFileData & fontData = GetChild<KaxFileData>(*attachedFile);
+                        
+                        if (fontData.GetSize()) {
+                                ATSFontContainerRef container;
+                                ATSFontActivateFromMemory(fontData.GetBuffer(), fontData.GetSize(), kATSFontContextLocal, 
+                                                          kATSFontFormatUnspecified, NULL, kATSOptionFlagsDefault, &container);
+                        }
+                }
+                
+                attachedFile = &GetNextChild<KaxAttached>(attachments, *attachedFile);
+        }
+}
+
-void MatroskaImport::ImportCluster(KaxCluster &cluster, bool addToTrack)
-{