Changeset 279

Timestamp:

01/10/07 15:10:37 (2 years ago)

Author:

astrange

Message:

SSE2 accelerated y420 -> y422 conversion on x86. (All Intel Macs support SSE2.)
Started a (currently non-functional) AltiVec? conversion too.
Split colorspace conversion into its own file.

Files:

• trunk/ColorConversions.c (added)
• trunk/ColorConversions.h (added)
• trunk/FFusionCodec.c (modified) (5 diffs)
• trunk/Perian.xcodeproj/project.pbxproj (modified) (9 diffs)

trunk/FFusionCodec.c

@@ -31 +31 @@
-#include <Carbon/Carbon.h>
-#include <QuickTime/QuickTime.h>
+#include <Accelerate/Accelerate.h>
-
-#include "FFusionCodec.h"
@@ -36 +37 @@
-#include "avcodec.h"
-#include "Codecprintf.h"
+#include "ColorConversions.h"
-
-void inline swapFrame(AVFrame * *a, AVFrame * *b)
@@ -103 +105 @@
-
-static OSErr FFusionDecompress(AVCodecContext *context, UInt8 *dataPtr, ICMDataProcRecordPtr dataProc, long width, long height, AVFrame *picture, long length, int useFirstFrameHack, int failSilently);
-static void FastY420(UInt8 *baseAddr, AVFrame *picture);
-static void SlowY420(UInt8* baseAddr, int outRB, int width, int height, AVFrame * picture);
-static void EndianSwapRow32(UInt32 *d, UInt32 *s, size_t n);
-static void BGR24toRGB24(UInt8 *baseAddr, long rowBump, long width, long height, AVFrame *picture);
-static int FFusionGetBuffer(AVCodecContext *s, AVFrame *pic);
-static void FFusionReleaseBuffer(AVCodecContext *s, AVFrame *pic);
@@ -934 +932 @@
-        else if (myDrp->pixelFormat == k32ARGBPixelFormat && glob->avContext->pix_fmt == PIX_FMT_RGB32)
-        {
-
-
-
-
-
-
-
-
-
-
-
+
-        }
-        else
@@ -1306 +1294 @@
-    return err;
-}
-
-//-----------------------------------------------------------------
-// FastY420
-//-----------------------------------------------------------------
-// Returns y420 data directly to QuickTime which then converts
-// in RGB for display
-//-----------------------------------------------------------------
-
-static void FastY420(UInt8 *baseAddr, AVFrame *picture)
-{
-    PlanarPixmapInfoYUV420 *planar;
-        
-        /*From Docs: PixMap baseAddr points to a big-endian PlanarPixmapInfoYUV420 struct; see ImageCodec.i. */
-    planar = (PlanarPixmapInfoYUV420 *) baseAddr;
-    
-    // if ya can't set da poiners, set da offsets
-    planar->componentInfoY.offset = EndianU32_NtoB(picture->data[0] - baseAddr);
-    planar->componentInfoCb.offset =  EndianU32_NtoB(picture->data[1] - baseAddr);
-    planar->componentInfoCr.offset =  EndianU32_NtoB(picture->data[2] - baseAddr);
-    
-    // for the 16/32 add look at EDGE in mpegvideo.c
-    planar->componentInfoY.rowBytes = EndianU32_NtoB(picture->linesize[0]);
-    planar->componentInfoCb.rowBytes = EndianU32_NtoB(picture->linesize[1]);
-    planar->componentInfoCr.rowBytes = EndianU32_NtoB(picture->linesize[2]);
-}
-
-//-----------------------------------------------------------------
-// FFusionSlowDecompress
-//-----------------------------------------------------------------
-// We have to return 2yuv values because
-// QT version has no built-in y420 component.
-// Since we do the conversion ourselves it is not really optimized....
-// The function should never be called since many people now
-// have a decent OS/QT version.
-//-----------------------------------------------------------------
-
-#ifdef __BIG_ENDIAN__
-//hand-unrolled code is a bad idea on modern CPUs. luckily, this does not run on modern CPUs, only G3s.
-//also, big-endian only
-static void 
-SlowY420(UInt8* baseAddr, int outRB, int width, int height, AVFrame * picture)
-{
-        int             y = height >> 1;
-        int             halfWidth = width >> 1, halfHalfWidth = halfWidth >> 1;
-        UInt8          *inY = picture->data[0], *inU = picture->data[1], *inV = picture->data[2];
-        int             rB = picture->linesize[0], rbU = picture->linesize[1], rbV = picture->linesize[2];
-        
-        while (y--) {
-                UInt32         *ldst = (UInt32 *) baseAddr, *ldstr2 = (UInt32 *) (baseAddr + outRB);
-                UInt32         *lsrc = (UInt32 *) inY, *lsrcr2 = (UInt32 *) (inY + rB);
-                UInt16         *sU = (UInt16 *) inU, *sV = (UInt16 *) inV;
-                ptrdiff_t               off;
-                
-                for (off = 0; off < halfHalfWidth; off++) {
-                        UInt16          chrU = sU[off], chrV = sV[off];
-                        UInt32          row1luma = lsrc[off], row2luma = lsrcr2[off];
-                        UInt32          chromas1 = (chrU & 0xff00) << 16 | (chrV & 0xff00),
-                                chromas2 = (chrU & 0xff) << 24 | (chrV & 0xff) << 8;
-                        int             off2 = off * 2;
-                        
-                        ldst[off2] = chromas1 | (row1luma & 0xff000000) >> 8 | (row1luma & 0xff0000) >> 16;
-                        ldstr2[off2] = chromas1 | (row2luma & 0xff000000) >> 8 | (row2luma & 0xff0000) >> 16;
-                        off2++;
-                        ldst[off2] = chromas2 | (row1luma & 0xff00) << 8 | row1luma & 0xff;
-                        ldstr2[off2] = chromas2 | (row2luma & 0xff00) << 8 | row2luma & 0xff;
-                }
-                
-                if (halfWidth % 4) {
-                        UInt16         *ssrc = (UInt16 *) inY, *ssrcr2 = (UInt16 *) (inY + rB);
-                        
-                        ptrdiff_t       off = halfWidth - 2;
-                        UInt32          chromas = inV[off] << 8 | (inU[off] << 24);
-                        UInt16          row1luma = ssrc[off], row2luma = ssrcr2[off];
-                        
-                        ldst[off] = chromas | row1luma & 0xff | (row1luma & 0xff00) << 8;
-                        ldstr2[off] = chromas | row2luma & 0xff | (row2luma & 0xff00) << 8;
-                }
-                inY += rB * 2;
-                inU += rbU;
-                inV += rbV;
-                baseAddr += outRB * 2;
-        }
-}
-#else
-static void 
-SlowY420(UInt8* o, int outRB, int width, int height, AVFrame * picture)
-{
-        UInt8          *yc = picture->data[0], *u = picture->data[1], *v = picture->data[2];
-        int             rY = picture->linesize[0], rU = picture->linesize[1], rV = picture->linesize[2], y = 0, x, x2;
-        
-        for (; y < height; y++) {
-                for (x = 0, x2 = 0; x < width; x += 2, x2 += 4) {
-                        int             hx = x >> 1;
-                        o[x2] = u[hx];
-                        o[x2 + 1] = yc[x];
-                        o[x2 + 2] = v[hx];
-                        o[x2 + 3] = yc[x + 1];
-                }
-                
-                o += outRB;
-                yc += rY;
-                if (y % 2) {
-                        u += rU;
-                        v += rV;
-                }
-        }
-}
-#endif
-
-static void BGR24toRGB24(UInt8 *baseAddr, long rowBump, long width, long height, AVFrame *picture)
-{
-        unsigned int i, j;
-        UInt8 *srcPtr = picture->data[0];
-
-        for (i = 0; i < height; ++i)
-        {
-                for (j = 0; j < width * 3; j += 3)
-                {
-                        baseAddr[j] = srcPtr[j+2];
-                        baseAddr[j+1] = srcPtr[j+1];
-                        baseAddr[j+2] = srcPtr[j];
-                }
-                baseAddr += rowBump;
-                srcPtr += picture->linesize[0];
-        }
-}
-
-static void EndianSwapRow32(UInt32 *d, UInt32 *s, size_t n)
-{
-        while (n--) {*d++ = EndianU32_NtoB(*s); s++;}
-}

trunk/Perian.xcodeproj/project.pbxproj

@@ -102 +102 @@
-                11C85FE70A64315500DF3D73 /* Perian-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 11A709DA0A3CFCB6002058D4 /* Perian-Info.plist */; };
-                11F28DAD0B52EB75000AF78C /* SUUpdateAlert.m in Sources */ = {isa = PBXBuildFile; fileRef = 11F28DAC0B52EB75000AF78C /* SUUpdateAlert.m */; };
+                3D4A7A990B5533BC004C5D6A /* ColorConversions.c in Sources */ = {isa = PBXBuildFile; fileRef = 3D4A7A980B5533BC004C5D6A /* ColorConversions.c */; };
-                6116E5510B43C27B0020F1CE /* ACBaseCodec.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6116E5370B43C27B0020F1CE /* ACBaseCodec.cpp */; };
-                6116E5520B43C27B0020F1CE /* ACCodec.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6116E5390B43C27B0020F1CE /* ACCodec.cpp */; };
@@ -416 +417 @@
-                11F28DAB0B52EB75000AF78C /* SUUpdateAlert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SUUpdateAlert.h; sourceTree = "<group>"; };
-                11F28DAC0B52EB75000AF78C /* SUUpdateAlert.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SUUpdateAlert.m; sourceTree = "<group>"; };
+                3D4A7A970B5533BC004C5D6A /* ColorConversions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ColorConversions.h; sourceTree = "<group>"; };
+                3D4A7A980B5533BC004C5D6A /* ColorConversions.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ColorConversions.c; sourceTree = "<group>"; };
-                6116E5370B43C27B0020F1CE /* ACBaseCodec.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = ACBaseCodec.cpp; sourceTree = "<group>"; };
-                6116E5380B43C27B0020F1CE /* ACBaseCodec.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ACBaseCodec.h; sourceTree = "<group>"; };
@@ -591 +594 @@
-                F560DF0203D622D001ABA332 /* FFusionCodec.r */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.rez; path = FFusionCodec.r; sourceTree = "<group>"; };
-                F57755F40B51EB1800C7D833 /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = /System/Library/Frameworks/CoreFoundation.framework; sourceTree = "<absolute>"; };
-explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0
+includeInIndex = 0; lastKnownFileType = "compiled.mach-o.executable"
-                F5CFD1BC0B5000CE00616865 /* GBPerianPanePListGenerator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GBPerianPanePListGenerator.h; sourceTree = "<group>"; };
-                F5CFD1BD0B5000CE00616865 /* GBPerianPanePListGenerator.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GBPerianPanePListGenerator.m; sourceTree = "<group>"; };
@@ -1051 +1054 @@
-                                F560DEFE03D61C4601ABA332 /* FFusionCodecDispatch.h */,
-                                F560DF0003D61D0101ABA332 /* FFusionCodec.c */,
+                                3D4A7A970B5533BC004C5D6A /* ColorConversions.h */,
+                                3D4A7A980B5533BC004C5D6A /* ColorConversions.c */,
-                        );
-                        name = "Video Codec";
@@ -1060 +1065 @@
-                                F5CFD2D60B5012A100616865 /* A52Codec.component */,
-                                F5CFD2D80B5012A100616865 /* AC3MovieImport.component */,
-A52
+
-                        );
-                        name = Products;
@@ -1300 +1305 @@
-                        sourceTree = BUILT_PRODUCTS_DIR;
-                };
-A52
+
-                        isa = PBXReferenceProxy;
-                        fileType = wrapper.application;
-A52
+
-                        remoteRef = F5CFD2D90B5012A100616865 /* PBXContainerItemProxy */;
-                        sourceTree = BUILT_PRODUCTS_DIR;
@@ -1469 +1474 @@
-                                61FD41330B4F6F0800BEEFEA /* MatroskaImportPrivate.cpp in Sources */,
-                                F52286260B50625E00F8CF7D /* bitstream_info.c in Sources */,
+                                3D4A7A990B5533BC004C5D6A /* ColorConversions.c in Sources */,
-                        );
-                        runOnlyForDeploymentPostprocessing = 0;
@@ -1803 +1809 @@
-                                FRAMEWORK_SEARCH_PATHS_QUOTED_1 = "\"$(SYSTEM_DEVELOPER_DIR)/SDKs/MacOSX10.4u.sdk/System/Library/Frameworks\"";
-                                FRAMEWORK_SEARCH_PATHS_QUOTED_2 = "\"$(SYSTEM_DEVELOPER_DIR)/SDKs/MacOSX10.4u.sdk/System/Library/Frameworks\"";
+                                GCC_ALTIVEC_EXTENSIONS = YES;
-                                GCC_ENABLE_FIX_AND_CONTINUE = NO;
-                                GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
@@ -1922 +1929 @@
-                        buildSettings = {
-                                DEBUG_INFORMATION_FORMAT = dwarf;
+                                GCC_ALTIVEC_EXTENSIONS = YES;
-                        };
-                        name = Development;