Changeset 852

Timestamp:

04/19/08 03:21:58 (3 months ago)

Author:

astrange

Message:

Matroska: Fix FLAC import on my samples. (closes #262)
Subtitles: Comment.

Files:

• trunk/MatroskaCodecIDs.cpp (modified) (2 diffs)
• trunk/Subtitles/SubATSUIRenderer.m (modified) (1 diff)

trunk/MatroskaCodecIDs.cpp

@@ -143 +143 @@
-        
-        if (dir == kToSampleDescription) {
+                // WAVFORMATEX is stored in the private data, and some codecs (WMA) need it to decode
+                KaxCodecPrivate & codecPrivate = GetChild<KaxCodecPrivate>(*tr_entry);
+                
+                QTSoundDescriptionSetProperty(sndDesc, 
+                                              kQTPropertyClass_SoundDescription, 
+                                              kQTSoundDescriptionPropertyID_MagicCookie, 
+                                              codecPrivate.GetSize(), codecPrivate.GetBuffer());
+                
+                //XXX: What exactly was the point of all this?
+#if 0
-                Handle sndDescExt = NewHandle(0);
-                unsigned char *privateBuf;
@@ -207 +217 @@
-                DisposePtr((Ptr)packetSizes);
-                DisposeHandle(sndDescExt);
+#endif
-        }
-        return noErr;

trunk/Subtitles/SubATSUIRenderer.m

@@ -287 +287 @@
-}
-
+// XXX: Assumes ATSUFontID = ATSFontRef. This is true.
+// May appear as a memory leak, but it isn't, not really.
-static ATSUFontID GetFontIDForSSAName(NSString *name)
-{