Changeset 282

Timestamp:

01/10/07 23:56:56 (2 years ago)

Author:

astrange

Message:

Cosmetic cleanups for color conversion.
Implement YUV 4:2:2 copying (closes #68).

Files:

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

trunk/ColorConversions.c

@@ -152 +152 @@
-}
-
-SlowY420
+Y420toY422
-{
-        static void (*y420_function)(UInt8* baseAddr, int outRB, int width, int height, AVFrame * picture) = NULL;
@@ -170 +170 @@
-#include <emmintrin.h>
-
-SlowY420
+Y420toY422
-{
-        UInt8          *yc = picture->data[0], *uc = picture->data[1], *vc = picture->data[2];
@@ -218 +218 @@
-#endif
-
-long rowBytes, long width, long
+int rowBytes, int width, int
-{
-        int i, j;
@@ -236 +236 @@
-}
-
-long rowBytes, long width, long
+int rowBytes, int width, int
-{
-        int x, y;
@@ -253 +253 @@
-        }
-}
+
+void Y422toY422(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;
+                u += rU;
+                v += rV;
+        }
+}

trunk/ColorConversions.h

@@ -22 +22 @@
-
-extern void FastY420(UInt8 *baseAddr, AVFrame *picture);
-
-
-
+
+
+
+

trunk/FFusionCodec.c

@@ -924 +924 @@
-        else if (myDrp->pixelFormat == k2vuyPixelFormat && glob->avContext->pix_fmt == PIX_FMT_YUV420P)
-        {
-SlowY420
+Y420toY422
-        }
-        else if (myDrp->pixelFormat == k24RGBPixelFormat && glob->avContext->pix_fmt == PIX_FMT_BGR24)
@@ -933 +933 @@
-        {
-                RGB32toRGB32((UInt8 *)drp->baseAddr, drp->rowBytes, myDrp->width, myDrp->height, picture);
+        }
+        else if (myDrp->pixelFormat == k2vuyPixelFormat && glob->avContext->pix_fmt == PIX_FMT_YUV422P)
+        {
+                Y422toY422((UInt8 *)drp->baseAddr, drp->rowBytes, myDrp->width, myDrp->height, picture);
-        }
-        else