From 37a0852009a863acfa7afd3ab709e590959b70b1 Mon Sep 17 00:00:00 2001 From: Ronaldo Moura Date: Fri, 21 May 2010 18:05:38 +0000 Subject: blackfin: fix yuv422 to yuv420 conversion The old code is correct only when stride = 2*width. Patch by Ronaldo Moura backport r31142 by mru Originally committed as revision 23212 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6 --- libswscale/bfin/internal_bfin.S | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) (limited to 'libswscale/bfin') diff --git a/libswscale/bfin/internal_bfin.S b/libswscale/bfin/internal_bfin.S index 98f69ef53f..5af46540a8 100644 --- a/libswscale/bfin/internal_bfin.S +++ b/libswscale/bfin/internal_bfin.S @@ -479,9 +479,6 @@ DEFUN(uyvytoyv12, mL3, (const uint8_t *src, uint8_t *ydst, uint8_t *udst, uint8 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 *src, uint8_t *ydst, uint8_t *udst, uint8 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 *src, uint8_t *ydst, uint8_t *udst, uint8 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 *src, uint8_t *ydst, uint8_t *udst, uint8 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; -- cgit v1.2.3