Changeset 1069

Timestamp:

06/06/09 04:44:12 (9 months ago)

Author:

astrange

Message:

Fix Indeo.
- Add missing codec ID mapping (from Madd_the_sane)
- Add missing color conversion (inefficient and with bad code duplication)

Closes #53

Files:

• trunk/ColorConversions.c (modified) (4 diffs)
• trunk/FFusionCodec.c (modified) (2 diffs)

trunk/ColorConversions.c

@@ -422 +422 @@
-}
-
+static FASTCALL void Y410toY422(AVFrame *picture, UInt8 *o, int outRB, unsigned width, unsigned height)
+{
+        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];
+        int             x, y, halfwidth = width / 2;
+        
+        for (y = 0; y < height; y++) {
+                for (x = 0; x < halfwidth; x++) {
+                        int x2 = x * 2, x4 = x * 4;
+                        o[x4] = u[x/2];
+                        o[x4 + 1] = yc[x2];
+                        o[x4 + 2] = v[x/2];
+                        o[x4 + 3] = yc[x2 + 1];
+                }
+                
+                o += outRB;
+                yc += rY;
+                
+                if (y % 4 == 3) {
+                        u += rU;
+                        v += rV;
+                }
+        }
+}
+
-static void ClearRGB(UInt8 *baseAddr, int rowBytes, unsigned width, unsigned height, int bytesPerPixel)
-{
@@ -485 +510 @@
-{
-        switch (ffPixFmt) {
+                case PIX_FMT_RGB555LE:
+                case PIX_FMT_RGB555BE:
+                        return k16BE555PixelFormat;
+                case PIX_FMT_BGR24:
+                        return k24RGBPixelFormat; //XXX try k24BGRPixelFormat
+                case PIX_FMT_RGB24:
+                        return k24RGBPixelFormat;
+                case PIX_FMT_RGB32: // XXX not a specific pixel format, need LE & BE like 16-bit
+                        return k32ARGBPixelFormat;
+                case PIX_FMT_YUV410P:
+                        return k2vuyPixelFormat;
-                case PIX_FMT_YUV420P:
-                        return k2vuyPixelFormat; //disables "fast YUV" path
-                case PIX_FMT_BGR24:
-                        return k24RGBPixelFormat; //XXX try k24BGRPixelFormat
-                case PIX_FMT_RGB32: // XXX not a specific pixel format
-                        return k32ARGBPixelFormat;
-                case PIX_FMT_RGB24:
-                        return k24RGBPixelFormat;
-                case PIX_FMT_YUV422P:
-                        return k2vuyPixelFormat;
-                case PIX_FMT_YUVA420P:
-                        return k4444YpCbCrA8PixelFormat;
-                case PIX_FMT_RGB555LE:
-                case PIX_FMT_RGB555BE:
-                        return k16BE555PixelFormat;
-                default:
-                        return 0; // error
@@ -538 +565 @@
-                        funcs->convert = RGB24toRGB24;
-                        break;
+                case PIX_FMT_RGB555LE:
+                        funcs->clear = ClearRGB16;
+                        funcs->convert = RGB16LEtoRGB16;
+                        break;
+                case PIX_FMT_RGB555BE:
+                        funcs->clear = ClearRGB16;
+                        funcs->convert = RGB16toRGB16;
+                        break;
+                case PIX_FMT_YUV410P:
+                        funcs->clear = ClearY422;
+                        funcs->convert = Y410toY422;
+                        break;
-                case PIX_FMT_YUV422P:
-                        funcs->clear = ClearY422;
@@ -546 +585 @@
-                        funcs->convert = YA420toV408;
-                        break;
-                case PIX_FMT_RGB555LE:
-                        funcs->clear = ClearRGB16;
-                        funcs->convert = RGB16LEtoRGB16;
-                        break;
-                case PIX_FMT_RGB555BE:
-                        funcs->clear = ClearRGB16;
-                        funcs->convert = RGB16toRGB16;
-                        break;
-                default:
-                        return paramErr;

trunk/FFusionCodec.c

@@ -713 +713 @@
-                        case 'VP6A':
-                                codecID = CODEC_ID_VP6A;
+                                break;
+                                
+                        case 'RT21':
+                                codecID = CODEC_ID_INDEO2;
+                                break;
+                                
+                        case 'IV31':
+                        case 'IV32':
+                        case 'iv31':
+                        case 'iv32':
+                                codecID = CODEC_ID_INDEO3;
-                                break;
-                                
@@ -1524 +1535 @@
-                break;
-                                
-                       
+            
-            case 'IV32':
-                       
+            
-            case 'iv32':
-                err = GetComponentResource((Component)glob->self, codecInfoResourceType, kIndeo3CodecInfoResID, (Handle *)&tempCodecInfo);
-                break;
-                                
-                       
+            
-                err = GetComponentResource((Component)glob->self, codecInfoResourceType, kIndeo2CodecInfoResID, (Handle *)&tempCodecInfo);
-                break;