Changeset 1186

Timestamp:

10/25/09 19:51:15 (5 months ago)

Author:

astrange

Message:

Improve transparent subtitle hack.
- Add QT 7 Player exporting.
- Limit it to Front Row again on 10.5.
- Use the same code style as other app-specific hacks.
- Fix up the rendered image to look better with 1-bit alpha.

Files:

• trunk/CommonUtils.c (modified) (2 diffs)
• trunk/Subtitles/SubImport.mm (modified) (2 diffs)
• trunk/TextSubCodec.c (modified) (2 diffs)

trunk/CommonUtils.c

@@ -310 +310 @@
-};
-
-
+_10_6
-        CFSTR("CoreMediaAuthoringSourcePropertyHelper"),
+        CFSTR("Front Row"),
+        CFSTR("QTPlayerHelper")
+};
+
+static const CFStringRef defaultTransparentSubtitleList_10_5[] = {
-        CFSTR("Front Row")
-};
@@ -410 +415 @@
-        
-        if(forced == -1)
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        return forced;
-}

trunk/Subtitles/SubImport.mm

@@ -81 +81 @@
-}
-
-//Use ugly transparency ("transparent" blend mode) for files imported in Front Row
-//At the moment it doesn't support graphicsModePreBlackAlpha
-static bool ShouldEngageFrontRowHack(void)
-{
-        long minorVersion;
-        Gestalt(gestaltSystemVersionMinor, &minorVersion);
-        
-        bool systemVersionCheck = minorVersion >= 5;
-        bool appNameCheck = IsTransparentSubtitleHackEnabled();
-        
-        return systemVersionCheck && appNameCheck;
-}
-
-Track CreatePlaintextSubTrack(Movie theMovie, ImageDescriptionHandle imgDesc, 
-                              TimeScale timescale, Handle dataRef, OSType dataRefType, FourCharCode subType, Handle imageExtension, Rect movieBox)
@@ -125 +112 @@
-                        MediaHandler mh = GetMediaHandler(theMedia);
-                        
-ShouldEngageFrontRowHack
+IsTransparentSubtitleHackEnabled
-                                RGBColor blendColor = {0x0000, 0x0000, 0x0000};
-                                MediaSetGraphicsMode(mh, transparent, &blendColor);

trunk/TextSubCodec.c

@@ -31 +31 @@
-#include "PerianResourceIDs.h"
-#include "SubATSUIRenderer.h"
+#include "CommonUtils.h"
-
-// Data structures
@@ -332 +333 @@
-        
-        SubRenderPacket(glob->ssa,c,buf,myDrp->width,myDrp->height);
+        
+        if (IsTransparentSubtitleHackEnabled()) {
+                // Map 8-bit alpha (graphicsModePreBlendAlpha) to 1-bit alpha (transparent)
+                // Pretty much this is just mapping all opaque black to (1,1,1,255)
+                // Leaves ugly borders where AAing turned into opaque colors, but that's harder to deal with
+                Ptr p = drp->baseAddr;
+                int y, x;
+                UInt32 alphaMask = EndianU32_BtoN((myDrp->pixelFormat == k32ARGBPixelFormat) ? 0xFF000000 : 0xFF),
+                       replacement = EndianU32_BtoN((myDrp->pixelFormat == k32ARGBPixelFormat) ? 0xFF010101 : 0x010101FF);
+
+                for (y = 0; y < myDrp->height; y++) {
+                        UInt32 *p32 = (UInt32*)p;
+                        for (x = 0; x < myDrp->width; x++) {
+                                UInt32 px = *p32;
+                                
+                                // if px is black, and opaque (alpha == 255)
+                                if (!(px & ~alphaMask) && (px & alphaMask == alphaMask)) {
+                                        // then set it to not-quite-black so it'll show up
+                                        *p32 = replacement;
+                                }
+                                
+                                p32++;
+                        }
+                        
+                        p += drp->rowBytes;
+                }
+        }
-                
-        CFRelease(buf);