[FFmpeg-cvslog] r31142 - trunk/libswscale/bfin/internal_bfin.S

[mru]

Author: mru
Date: Fri May  7 23:59:18 2010
New Revision: 31142

Log:
blackfin: fix yuv422 to yuv420 conversion

The old code is correct only when stride = 2*width.

Patch by Ronaldo Moura <ronaldo d moura monity com br>

Modified:
   trunk/libswscale/bfin/internal_bfin.S

Modified: trunk/libswscale/bfin/internal_bfin.S
==============================================================================
--- trunk/libswscale/bfin/internal_bfin.S	Fri May  7 20:27:46 2010	(r31141)
+++ trunk/libswscale/bfin/internal_bfin.S	Fri May  7 23:59:18 2010	(r31142)
@@ -479,9 +479,6 @@ DEFUN(uyvytoyv12, mL3,  (const uint8_t *
 
         r1 = [fp + ARG_srcStride];
         r2 = r0 + r1;
-        r1 += -8;  // i0,i1 is pre read need to correct
-        m0 = r1;
-
         i0 = r0;  // uyvy_T even
         i1 = r2;  // uyvy_B odd
 
@@ -494,6 +491,12 @@ DEFUN(uyvytoyv12, mL3,  (const uint8_t *
         p4 = p4 >> 1;
         p5 = p5 >> 2;
 
+        r2 = r0 << 1;
+        r1 = r1 << 1;
+        r1 = r1 - r2;  // srcStride + (srcStride - 2*width)
+        r1 += -8;  // i0,i1 is pre read need to correct
+        m0 = r1;
+
         r2 = [fp + ARG_chromStride];
         r0 = r0 >> 1;
         r2 = r2 - r0;
@@ -549,8 +552,6 @@ DEFUN(yuyvtoyv12, mL3,  (const uint8_t *
 
         r1 = [fp + ARG_srcStride];
         r2 = r0 + r1;
-        r1 += -8;  // i0,i1 is pre read need to correct
-        m0 = r1;
 
         i0 = r0;  // uyvy_T even
         i1 = r2;  // uyvy_B odd
@@ -564,6 +565,12 @@ DEFUN(yuyvtoyv12, mL3,  (const uint8_t *
         p4 = p4 >> 1;
         p5 = p5 >> 2;
 
+        r2 = r0 << 1;
+        r1 = r1 << 1;
+        r1 = r1 - r2;  // srcStride + (srcStride - 2*width)
+        r1 += -8;  // i0,i1 is pre read need to correct
+        m0 = r1;
+
         r2 = [fp + ARG_chromStride];
         r0 = r0 >> 1;
         r2 = r2 - r0;