Ticket #2312: patch.diff

yuv2rgb.cpp

@@ -682 +682 @@
     }
 }
 
+static void non_vec_yuv420_2vuy (uint8_t * image, uint8_t * py,
+                                 uint8_t * pu, uint8_t * pv,
+                                 int h_size, int v_size,
+                                 int vuy_stride, int y_stride, int uv_stride)
+{
+    uint8_t *pi1, *pi2 = image;
+    uint8_t *py1, *py2 = py;
+
+    int x, y;
+
+    for (y = v_size / 2; y--; )
+    {
+        pi1  = pi2;
+        pi2 += h_size * 2;
+        py1  = py2;
+        py2 += h_size;
+
+        for (x = h_size / 2; x--; )
+        {
+            *(pi1)++ =            *(pi2)++ = *(pu)++;
+            *(pi1)++ = *(py1)++;  *(pi2)++ = *(py2)++;
+            *(pi1)++ =            *(pi2)++ = *(pv)++;
+            *(pi1)++ = *(py1)++;  *(pi2)++ = *(py2)++;
+        }
+
+        py1 += y_stride;
+        py2 += y_stride;
+        pu  += uv_stride;
+        pv  += uv_stride;
+        pi1 += vuy_stride;
+        pi2 += vuy_stride;
+    }
+}
+
 /* YUV420 to VUY2 colorspace conversion routines.
  *
  * In the early days of the OS X port of MythTV, Paul Jara noticed that
@@ -711 +745 @@
     
     int x,y;
     
+    if (!((h_size % 16) | (v_size % 2))) 
+{
     for(y = v_size/2; y--; )
     {
         ibuf1 = ibuf2;
@@ -781 +817 @@
     }
 }
 
-#endif // MMX
+else
+    {
+        // Fall back to C version
+        non_vec_yuv420_2vuy(image, py, pu, pv, h_size, v_size,
+                            vuy_stride, y_stride, uv_stride);
+    }
 
+}
 
-static void non_vec_yuv420_2vuy (uint8_t * image, uint8_t * py,
-                                 uint8_t * pu, uint8_t * pv,
-                                 int h_size, int v_size,
-                                 int vuy_stride, int y_stride, int uv_stride)
-{
-    uint8_t *pi1, *pi2 = image;
-    uint8_t *py1, *py2 = py;
+#endif // MMX
 
-    int x, y;
 
-    for (y = v_size / 2; y--; )
-    {
-        pi1  = pi2;
-        pi2 += h_size * 2;
-        py1  = py2;
-        py2 += h_size;
 
-        for (x = h_size / 2; x--; )
-        {
-            *(pi1)++ =            *(pi2)++ = *(pu)++;
-            *(pi1)++ = *(py1)++;  *(pi2)++ = *(py2)++;
-            *(pi1)++ =            *(pi2)++ = *(pv)++;
-            *(pi1)++ = *(py1)++;  *(pi2)++ = *(py2)++;
-        }
 
-        py1 += y_stride;
-        py2 += y_stride;
-        pu  += uv_stride;
-        pv  += uv_stride;
-        pi1 += vuy_stride;
-        pi2 += vuy_stride;
-    }
-}
-
-
 #ifdef HAVE_ALTIVEC
 
 // Altivec code adapted from VLC's i420_yuv2.c (thanks to Titer and Paul Jara)