Changeset 1202

Timestamp:

11/19/09 00:35:58 (4 months ago)

Author:

astrange

Message:

Apply transparent subtitle hack to VobSub?.

Also add the track colorspace atoms.
Add a missing process name to the list for transparent subtitles.

Fixes #456.

Files:

• trunk/CommonUtils.c (modified) (2 diffs)
• trunk/CommonUtils.h (modified) (1 diff)
• trunk/MatroskaImportPrivate.cpp (modified) (3 diffs)
• trunk/Subtitles/SubImport.h (modified) (1 diff)
• trunk/Subtitles/SubImport.mm (modified) (5 diffs)
• trunk/TextSubCodec.c (modified) (1 diff)
• trunk/VobSubCodec.c (modified) (1 diff)

trunk/CommonUtils.c

@@ -314 +314 @@
-
-static const CFStringRef defaultTransparentSubtitleList_10_6[] = {
+        CFSTR("CoreMediaAuthoringSessionHelper"),
-        CFSTR("CoreMediaAuthoringSourcePropertyHelper"),
-        CFSTR("Front Row"),
@@ -589 +590 @@
-        return sRGBColorSpace;
-}
+
+// Map 8-bit alpha (graphicsModePreBlackAlpha) 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
+void ConvertImageToQDTransparent(Ptr baseAddr, OSType pixelFormat, int rowBytes, int width, int height)
+{
+        UInt32 alphaMask = EndianU32_BtoN((pixelFormat == k32ARGBPixelFormat) ? 0xFF000000 : 0xFF),
+                 replacement = EndianU32_BtoN((pixelFormat == k32ARGBPixelFormat) ? 0xFF010101 : 0x010101FF);
+        Ptr p = baseAddr;
+        int y, x;
+        
+        for (y = 0; y < height; y++) {
+                UInt32 *p32 = (UInt32*)p;
+                for (x = 0; x < 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 += rowBytes;
+        }
+}

trunk/CommonUtils.h

@@ -78 +78 @@
-CGColorSpaceRef GetSRGBColorSpace();
-
+// postprocess RGBA+8-bit to not look terrible when displayed with 'transparent' blend mode
+void ConvertImageToQDTransparent(Ptr baseAddr, OSType pixelFormat, int rowBytes, int width, int height);
+        
-#define PERIAN_PREF_DOMAIN CFSTR("org.perian.Perian")
-

trunk/MatroskaImportPrivate.cpp

@@ -597 +597 @@
-                }
-                
+                set_track_colorspace_ext(imgDesc, width, height);
+                
-                mkvTrack.theTrack = NewMovieTrack(theMovie, trackWidth, trackHeight, kNoVolume);
-                if (mkvTrack.theTrack == NULL)
@@ -607 +609 @@
-                // finally, say that we're transparent
-                mh = GetMediaHandler(mkvTrack.theMedia);
-MediaSetGraphicsMode(mh, graphicsModePreBlackAlpha, NULL
+SetSubtitleMediaHandlerTransparent(mh
-                
-                // subtitle tracks should be above the video track, which should be layer 0
@@ -622 +624 @@
-                
-                PtrAndHand(&emptyDataRefExtension[0], mkvTrack.subDataRefHandler, sizeof(emptyDataRefExtension));
-
+               
-                mkvTrack.theTrack = CreatePlaintextSubTrack(theMovie, imgDesc, GetMovieTimeScale(theMovie), mkvTrack.subDataRefHandler, HandleDataHandlerSubType, (*imgDesc)->cType, NULL, movieBox);
-                if (mkvTrack.theTrack == NULL)

trunk/Subtitles/SubImport.h

@@ -41 +41 @@
-short GetFilenameLanguage(CFStringRef filename);
-ComponentResult LoadExternalSubtitlesFromFileDataRef(Handle dataRef, OSType dataRefType, Movie theMovie);
+void SetSubtitleMediaHandlerTransparent(MediaHandler mh);
-Track CreatePlaintextSubTrack(Movie theMovie, ImageDescriptionHandle imgDesc, TimeScale timescale, Handle dataRef, OSType dataRefType, FourCharCode subType, Handle imageExtension, Rect movieBox);
-

trunk/Subtitles/SubImport.mm

@@ -32 +32 @@
-extern "C" {
-        int ExtractVobSubPacket(UInt8 *dest, const UInt8 *framedSrc, int srcSize, int *usedSrcBytes, int index);
+        void set_track_colorspace_ext(ImageDescriptionHandle imgDescHandle, Fixed displayW, Fixed displayH);
-}
-
@@ -79 +80 @@
-                                                                   kICMImageDescriptionPropertyID_ICCProfile, sizeof(CFDataRef), &cSpaceICC);
-        CFRelease(cSpaceICC);
+}
+
+void SetSubtitleMediaHandlerTransparent(MediaHandler mh)
+{
+        if (IsTransparentSubtitleHackEnabled()) {
+                RGBColor blendColor = {0x0000, 0x0000, 0x0000};
+                MediaSetGraphicsMode(mh, transparent, &blendColor);
+        }
+        else
+                MediaSetGraphicsMode(mh, graphicsModePreBlackAlpha, NULL);
-}
-
@@ -113 +124 @@
-                        MediaHandler mh = GetMediaHandler(theMedia);
-                        
-
-
-
-
-
+
-                        
-                        // subtitle tracks should be above the video track, which should be layer 0
@@ -678 +685 @@
-        (*imgDesc)->width = FixedToInt(trackWidth);
-        (*imgDesc)->height = FixedToInt(trackHeight);
+        set_track_colorspace_ext(imgDesc, (*imgDesc)->width, (*imgDesc)->height);
-        Track theTrack = NewMovieTrack(theMovie, trackWidth, trackHeight, kNoVolume);
-        if(theTrack == NULL)
@@ -688 +696 @@
-                return NULL;
-        }
-
-MediaSetGraphicsMode(mh, graphicsModePreBlackAlpha, NULL
+   
+SetSubtitleMediaHandlerTransparent(mh
-        SetTrackLayer(theTrack, -1);
-        

trunk/TextSubCodec.c

@@ -332 +332 @@
-        SubRenderPacket(glob->ssa,c,buf,myDrp->width,myDrp->height);
-        
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-                
-        CFRelease(buf);

trunk/VobSubCodec.c

@@ -395 +395 @@
-        }
-        
+        if (IsTransparentSubtitleHackEnabled())
+                ConvertImageToQDTransparent(drp->baseAddr, k32ARGBPixelFormat, drp->rowBytes, myDrp->width, myDrp->height);
+        
-        return err;
-}