Mercurial > mplayer.hg
changeset 29410:fd9b0bd6c908
MMX2 scaler: add variable to ease factorization of initMMX2Scaler().
| author | ramiro |
|---|---|
| date | Tue, 28 Jul 2009 05:41:22 +0000 |
| parents | 4b0a12d0e5bd |
| children | 0192dbbb3121 |
| files | libswscale/swscale.c |
| diffstat | 1 files changed, 4 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/libswscale/swscale.c Tue Jul 28 05:14:47 2009 +0000 +++ b/libswscale/swscale.c Tue Jul 28 05:41:22 2009 +0000 @@ -1888,6 +1888,7 @@ int b=((xpos+xInc)>>16) - xx; int c=((xpos+xInc*2)>>16) - xx; int d=((xpos+xInc*3)>>16) - xx; + int inc = (d+1<4); filter[i ] = (( xpos & 0xFFFF) ^ 0xFFFF)>>9; filter[i+1] = (((xpos+xInc ) & 0xFFFF) ^ 0xFFFF)>>9; @@ -1897,17 +1898,17 @@ if (d+1<4) { - int maxShift= 3-(d+1); + int maxShift= 3-(d+inc); int shift=0; memcpy(funnyCode + fragmentPos, fragmentB, fragmentLengthB); funnyCode[fragmentPos + imm8OfPShufW1B]= - (a+1) | ((b+1)<<2) | ((c+1)<<4) | ((d+1)<<6); + (a+inc) | ((b+inc)<<2) | ((c+inc)<<4) | ((d+inc)<<6); funnyCode[fragmentPos + imm8OfPShufW2B]= a | (b<<2) | (c<<4) | (d<<6); - if (i+3>=dstW) shift=maxShift; //avoid overread + if (i+4-inc>=dstW) shift=maxShift; //avoid overread else if ((filterPos[i/2]&3) <= maxShift) shift=filterPos[i/2]&3; //Align if (shift && i>=shift)