Changeset 850

Timestamp:

04/18/08 23:31:08 (6 months ago)

Author:

astrange

Message:

Preroll subtitle fonts when loading the file.
This moves the annoying pause on start to the main thread.

Some cleanup.

Files:

• trunk/MatroskaImport.h (modified) (1 diff)
• trunk/MatroskaImportPrivate.cpp (modified) (2 diffs)
• trunk/Subtitles/SubATSUIRenderer.h (modified) (2 diffs)
• trunk/Subtitles/SubATSUIRenderer.m (modified) (3 diffs)
• trunk/Subtitles/SubImport.h (modified) (2 diffs)
• trunk/Subtitles/SubImport.mm (modified) (2 diffs)
• trunk/TextSubCodec.c (modified) (1 diff)

trunk/MatroskaImport.h

@@ -258 +258 @@
-        // value if not null, and seeks to the specified point in the file.
-        void SetContext(MatroskaSeekContext context);
+        
+        // After the fonts are loaded, preplay the subtitle tracks to avoid an annoying pause
+        // from unavoidably lazy rendering APIs looking them up for the first time.
+        void PrerollSubtitleTracks();
-                
-        ComponentInstance               self;

trunk/MatroskaImportPrivate.cpp

@@ -111 +111 @@
-                
-        } else if (EbmlId(*el_l1) == KaxAttachments::ClassInfos.GlobalId) {
+                ComponentResult res;
-                el_l1->Read(*aStream, KaxAttachments::ClassInfos.Context, upperLevel, dummyElt, true);
-
-
+
+
+
-        } else if (EbmlId(*el_l1) == KaxSeekHead::ClassInfos.GlobalId) {
-                el_l1->Read(*aStream, KaxSeekHead::ClassInfos.Context, upperLevel, dummyElt, true);
@@ -876 +878 @@
-}
-
+void MatroskaImport::PrerollSubtitleTracks()
+{
+        if (!seenTracks) return;
+                
+        for (int i = 0; i < tracks.size(); i++) {
+                if (tracks[i].type == track_subtitle) {
+                        Handle subtitleDescriptionExt;
+                        OSErr err = GetImageDescriptionExtension((ImageDescriptionHandle)tracks[i].desc, &subtitleDescriptionExt, kSubFormatSSA, 0);
+                        
+                        if (err || !subtitleDescriptionExt) continue;
+                        
+                        SubPrerollFromHeader(*subtitleDescriptionExt, GetHandleSize(subtitleDescriptionExt));
+                }
+        }
+}
-
-MatroskaTrack::MatroskaTrack()

trunk/Subtitles/SubATSUIRenderer.h

@@ -6 +6 @@
-//  Copyright 2007 __MyCompanyName__. All rights reserved.
-//
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
-
-#ifdef __OBJC__
@@ -31 +36 @@
-
-typedef void *SubtitleRendererPtr;
+
+#endif
+
-extern SubtitleRendererPtr SubInitForSSA(char *header, size_t headerLen, int width, int height);
-extern SubtitleRendererPtr SubInitNonSSA(int width, int height);
-extern CGColorSpaceRef SubGetColorSpace(SubtitleRendererPtr s);
-extern void SubRenderPacket(SubtitleRendererPtr s, CGContextRef c, CFStringRef str, int cWidth, int cHeight);
+extern void SubPrerollFromHeader(char *header, int headerLen);
-extern void SubDisposeRenderer(SubtitleRendererPtr s);
-
+#ifdef __cplusplus
+}
-#endif

trunk/Subtitles/SubATSUIRenderer.m

@@ -286 +286 @@
-}
-
+static ATSFontRef gHelveticaATSRef = -1;
+static ATSUFontID gHelveticaATSUID;
+
-static ATSUFontID GetFontIDForSSAName(NSString *name, ATSFontRef *_fontRef)
-{
@@ -301 +304 @@
-                
-                if (font == kATSUInvalidFontID) {
-
-
+
+
+
+
+
+
+
-                }
-        } else fontRef = FMGetATSFontRefFromFont(font);
@@ -1097 +1105 @@
-}
-
+void SubPrerollFromHeader(char *header, int headerLen)
+{
+        NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+        SubtitleRendererPtr s = headerLen ? SubInitForSSA(header, headerLen, 640, 480)
+                                                                      : SubInitNonSSA(640, 480);
+        
+        CGColorSpaceRef csp = CGColorSpaceCreateWithName(kCGColorSpaceGenericRGB);
+        void *buf = malloc(640 * 480 * 4);
+        CGContextRef c = CGBitmapContextCreate(buf,640,480,8,640 * 4,csp,kCGImageAlphaPremultipliedFirst);
+        
+        if (!headerLen) {
+                SubRenderPacket(s, c, (CFStringRef)@"to Be continued", 640, 480);
+        } else {
+                NSArray *styles = [s->context->styles allValues];
+                int i, nstyles = [styles count];
+                
+                for (i = 0; i < nstyles; i++) {
+                        SubStyle *sty = [styles objectAtIndex:i];
+                        NSString *line = [NSString stringWithFormat:@"0,0,%@,,0,0,0,,to Be continued", sty->name];
+                        SubRenderPacket(s, c, (CFStringRef)line, 640, 480);
+                }
+        }
+        
+        CGContextRelease(c);
+        free(buf);
+        CGColorSpaceRelease(csp);
+        [pool release];
+}
+
-void SubDisposeRenderer(SubtitleRendererPtr s)
-{

trunk/Subtitles/SubImport.h

@@ -11 +11 @@
-
-#include <QuickTime/QuickTime.h>
+#ifndef __OBJC__
+#include "SubATSUIRenderer.h"
+#endif
-
-#ifndef __OBJC_GC__
@@ -31 +34 @@
-#import <Cocoa/Cocoa.h>
-#import "SubContext.h"
+#import "SubATSUIRenderer.h"
-
-@interface SubLine : NSObject

trunk/Subtitles/SubImport.mm

@@ -252 +252 @@
-        [ss setFinished:YES];
-
+        SubPrerollFromHeader(header ? *header : NULL, header ? GetHandleSize(header) : 0);
+        
-        Handle dataRefHndl = NewHandleClear(sizeof(Handle) + 1);
-        UInt32 emptyDataRefExt[2] = {EndianU32_NtoB(sizeof(UInt32)*2), EndianU32_NtoB(kDataRefExtensionInitializationData)};
@@ -293 +295 @@
-                        err = GetMoviesError();
-                        Codecprintf(stderr,"error %d adding line from %d to %d in external subtitles",err,sl->begin_time,sl->end_time);
-
-
-
-
-
-
-
-
+
+
+
+
+
-                err = noErr;
-                DisposeHandle(sampleHndl);

trunk/TextSubCodec.c

@@ -248 +248 @@
-                
-                if (!glob->ssa) glob->ssa = SubInitNonSSA((**p->imageDescription).width,(**p->imageDescription).height);
-
-
-
+
-                glob->colorSpace = CGColorSpaceCreateWithName(kCGColorSpaceGenericRGB);
-        }