Changeset 826

Timestamp:

03/12/08 11:41:26 (7 months ago)

Author:

gbooker

Message:

Perform color conversion on final line if the height is an odd number of pixels. Tested on intel, should work on others as well.
Fixes #307

Files:

• trunk/ColorConversions.c (modified) (5 diffs)

trunk/ColorConversions.c

@@ -104 +104 @@
-                 baseAddr += outRB * 2;
-         }
+        if(height & 1)
+        {
+                int x;
+                for(x=0; x < halfWidth; x++)
+                {
+                        unsigned x4 = x*4, x2 = x*2;
+                        baseAddr[x4] = inU[x];
+                        baseAddr[x4+1] = inY[x2];
+                        baseAddr[x4+2] = inV[x];
+                        baseAddr[x4+3] = inY[x2+1];
+                }
+        }       
- }
-
@@ -154 +166 @@
-                vc += rV;
-        }
+        if(height & 1)
+        {
+                unsigned halfwidth = width / 2;
+                for(x=0; x < halfwidth; x++)
+                {
+                        unsigned x4 = x*4, x2 = x*2;
+                        o[x4] = uc[x];
+                        o[x4+1] = yc[x2];
+                        o[x4+2] = vc[x];
+                        o[x4+3] = yc[x2+1];
+                }
+        }       
-}
-
@@ -189 +213 @@
-                        unsigned x2 = x*2, x4 = x*4;
-
-0
+1
-                        asm volatile(
-                                "movdqu         %4,             %%xmm4  \n\t"
@@ -259 +283 @@
-                vc += rV;
-        }
+        if(height & 1)
+        {
+                for(x=0; x < halfwidth; x++)
+                {
+                        unsigned x4 = x*4, x2 = x*2;
+                        o[x4] = uc[x];
+                        o[x4+1] = yc[x2];
+                        o[x4+2] = vc[x];
+                        o[x4+3] = yc[x2+1];
+                }
+        }
-}
-
@@ -285 +320 @@
-                u += rU;
-                v += rV;
+        }
+        if(height & 1)
+        {
+                for(x=0; x < halfwidth; x++)
+                {
+                        unsigned x4 = x*4, x2 = x*2;
+                        o[x4] = u[x];
+                        o[x4+1] = yc[x2];
+                        o[x4+2] = v[x];
+                        o[x4+3] = yc[x2+1];
+                }
-        }
-}