Changeset 1039

Timestamp:

04/03/09 17:10:18 (1 year ago)

Author:

astrange

Message:

* Remove fast y420 path that never worked.
* Merge code dealing with ff->qt pixel format conversions.
* Add RGB16 LE -> RGB16 BE conversion.
(fixes mphq sample V-codecs/tscc/TI_1_Einfuehrung.avi)
* Get rid of a direct call to fprintf() and some other pointless repetitive logging.
* Bail when possible if a codec returns a PixelFormat? we can't handle.

Files:

• trunk/ColorConversions.c (modified) (5 diffs)
• trunk/ColorConversions.h (modified) (1 diff)
• trunk/FFusionCodec.c (modified) (9 diffs)

trunk/ColorConversions.c

@@ -38 +38 @@
-#define unlikely(x) __builtin_expect(x, 0)
-#define likely(x) __builtin_expect(x, 1)
-
-static FASTCALL void FastY420(AVFrame *picture, UInt8 *baseAddr, int outRowBytes, unsigned outWidth, unsigned outHeight)
-{
-    PlanarPixmapInfoYUV420 *planar = (PlanarPixmapInfoYUV420 *)baseAddr;        
-        /*From Docs: PixMap baseAddr points to a big-endian PlanarPixmapInfoYUV420 struct; see ImageCodec.i. */
-    
-    // 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]);
-}
-
-//Handles the last row for Y420 videos with an odd number of luma rows
@@ -377 +361 @@
-}
-
-24toRGB24(AVFrame *picture, UInt8 *baseAddr, int rowBytes, unsigned width, unsigned height
+toRGB(AVFrame *picture, UInt8 *baseAddr, int rowBytes, unsigned width, unsigned height, unsigned bytesPerPixel
-{
-        UInt8 *srcPtr = picture->data[0];
@@ -384 +368 @@
-        
-        for (y = 0; y < height; y++) {
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                
-                baseAddr += rowBytes;
@@ -432 +441 @@
-{
-        ClearRGB(baseAddr, rowBytes, width, height, 3);
+}
+
+static FASTCALL void ClearRGB16(UInt8 *baseAddr, int rowBytes, unsigned width, unsigned height)
+{
+        ClearRGB(baseAddr, rowBytes, width, height, 2);
-}
-
@@ -468 +482 @@
-}
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
-int ColorConversionFindFor(ColorConversionFuncs *funcs, enum PixelFormat ffPixFmt, AVFrame *ffPicture, OSType qtPixFmt)
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-#ifdef __ppc__
-
-
-
-
+       
+       
+       
+       
-#else
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-        

trunk/ColorConversions.h

@@ -40 +40 @@
-} ColorConversionFuncs;
-
+extern OSType ColorConversionDstForPixFmt(enum PixelFormat ffPixFmt);
-extern int ColorConversionFindFor(ColorConversionFuncs *funcs, enum PixelFormat ffPixFmt, AVFrame *ffPicture, OSType qtPixFmt);

trunk/FFusionCodec.c

@@ -118 +118 @@
-    AVCodecContext      *avContext;
-    OSType                      componentType;
-    char                        hasy420;
-        FILE                    *fileLog;
-        AVFrame                 lastDisplayedFrame;
@@ -317 +316 @@
-    ComponentResult err;
-    ComponentDescription descout;
-    ComponentDescription cd;
-    Component c = 0;
-    long bitfield;
-        
-    cd.componentType = 'imdc';
-    cd.componentSubType = 'y420';
-    cd.componentManufacturer = 0;
-    cd.componentFlags = 0;
-    cd.componentFlagsMask = 0;
-    
-    GetComponentInfo((Component)self, &descout, 0, 0, 0);
@@ -349 +339 @@
-        glob->pixelTypes = NewHandle(10 * sizeof(OSType));
-        glob->avCodec = 0;
-        glob->hasy420 = 0;
-        glob->componentType = descout.componentSubType;
-                glob->packedType = PACKED_ALL_IN_FIRST_FRAME;  //Unless we have reason to believe otherwise.
@@ -360 +349 @@
-                }
-                glob->shouldUseReturnedFrame = 0;
-
-//        c = FindNextComponent(c, &cd);
-                
-        if (c != 0)
-        {            
-            Gestalt(gestaltSystemVersion, &bitfield);
-            
-            if (bitfield >= 0x1010)
-            {
-  //              Codecprintf(glob->fileLog, "Use speedy y420 component\n");
-                glob->hasy420 = 1;
-            }
-        }
-        else
-        {
-  //          Codecprintf(glob->fileLog, "Use slow y420 component\n");
-        }
-                
-        // Open and target an instance of the base decompressor as we delegate
@@ -875 +847 @@
-    capabilities->wantedPixelSize = 0;
-    
-    // Type of pixels used in output
-    // If QuickTime got the y420 component it is cool
-    // since libavcodec ouputs y420
-    // If not we'll do some king of conversion to 2vuy
-    
-    HLock(glob->pixelTypes);
-    pos = *((OSType **)glob->pixelTypes);
@@ -886 +853 @@
-        
-        if (!err) {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-    
@@ -1018 +973 @@
-        
-        if (!glob->avContext) {
-fprintf(stderr
+Codecprintf(glob->fileLog
-                return internalComponentErr;
+        }
+        
+        if (p->frameNumber == 0 && myDrp->pixelFormat != ColorConversionDstForPixFmt(glob->avContext->pix_fmt)) {
+                Codecprintf(glob->fileLog, "QT gave us unwanted pixelFormat %s (%08x), this will not work\n", FourCCString(myDrp->pixelFormat), myDrp->pixelFormat);
-        }
-        
@@ -1365 +1324 @@
-                        if (!glob->colorConv.clear) {
-                                err = ColorConversionFindFor(&glob->colorConv, glob->avContext->pix_fmt, NULL, myDrp->pixelFormat);
-                                
-                                if (err) goto err;
-                        }
@@ -1381 +1339 @@
-        if (!glob->colorConv.convert) {
-                err = ColorConversionFindFor(&glob->colorConv, glob->avContext->pix_fmt, picture, myDrp->pixelFormat);
-
-
-
-
-
-
+
-        }
-