From 84adc106cf2ced0d10ff429027e9a89608e8f62d Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Fri, 19 Oct 2001 15:50:44 +0000 Subject: [PATCH] first line bug fixed (happend if the image was scaled down or 1:1) Originally committed as revision 2298 to svn://svn.mplayerhq.hu/mplayer/trunk/postproc --- postproc/swscale.c | 9 +++++++-- postproc/swscale_template.c | 9 +++++++-- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/postproc/swscale.c b/postproc/swscale.c index 61b5c5480a..878c7ddc81 100644 --- a/postproc/swscale.c +++ b/postproc/swscale.c @@ -98,7 +98,6 @@ static int old_s_xinc= -1; #endif int canMMX2BeUsed=0; -static int test=0; int srcWidth= (dstw*s_xinc + 0x8000)>>16; #ifdef HAVE_MMX2 @@ -119,7 +118,7 @@ s_xinc2=s_xinc>>1; s_last_y1pos=-99; if(y==0){ - s_srcypos= s_yinc/2 - 0x8000; + s_srcypos=-0x8000; s_ypos=0; #ifdef HAVE_MMX2 // cant downscale !!! @@ -534,6 +533,12 @@ FUNNYUVCODE xpos+=s_xinc2; } #endif + // if this is the line before the first line + if(s_srcypos == s_xinc - 0x8000) + { + s_srcypos= s_yinc/2 - 0x8000; + continue; + } } diff --git a/postproc/swscale_template.c b/postproc/swscale_template.c index 61b5c5480a..878c7ddc81 100644 --- a/postproc/swscale_template.c +++ b/postproc/swscale_template.c @@ -98,7 +98,6 @@ static int old_s_xinc= -1; #endif int canMMX2BeUsed=0; -static int test=0; int srcWidth= (dstw*s_xinc + 0x8000)>>16; #ifdef HAVE_MMX2 @@ -119,7 +118,7 @@ s_xinc2=s_xinc>>1; s_last_y1pos=-99; if(y==0){ - s_srcypos= s_yinc/2 - 0x8000; + s_srcypos=-0x8000; s_ypos=0; #ifdef HAVE_MMX2 // cant downscale !!! @@ -534,6 +533,12 @@ FUNNYUVCODE xpos+=s_xinc2; } #endif + // if this is the line before the first line + if(s_srcypos == s_xinc - 0x8000) + { + s_srcypos= s_yinc/2 - 0x8000; + continue; + } }