opensource/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-06-22 23:45:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

MMX2 scaler: Remove {} block leftover from factorization in initMMX2Scaler().

Browse Source 
Merge variable declarations to previous {} block and indent.

Originally committed as revision 29454 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
This commit is contained in:
Ramiro Polla
2009-07-28 05:45:47 +00:00
parent f1c6dfa371
commit 469fd9b0e1
1 changed files with 18 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
libswscale/swscale.c
View File

@ -1893,6 +1893,8 @@ static void initMMX2HScaler(int dstW, int xInc, uint8_t *funnyCode, int16_t *fil
x86_reg imm8OfPShufW1 = (d+1<4) ? imm8OfPShufW1B : imm8OfPShufW1A; x86_reg imm8OfPShufW1 = (d+1<4) ? imm8OfPShufW1B : imm8OfPShufW1A;
x86_reg imm8OfPShufW2 = (d+1<4) ? imm8OfPShufW2B : imm8OfPShufW2A; x86_reg imm8OfPShufW2 = (d+1<4) ? imm8OfPShufW2B : imm8OfPShufW2A;
x86_reg fragmentLength = (d+1<4) ? fragmentLengthB : fragmentLengthA; x86_reg fragmentLength = (d+1<4) ? fragmentLengthB : fragmentLengthA;
int maxShift= 3-(d+inc);
int shift=0;
filter[i ] = (( xpos & 0xFFFF) ^ 0xFFFF)>>9; filter[i ] = (( xpos & 0xFFFF) ^ 0xFFFF)>>9;
filter[i+1] = (((xpos+xInc ) & 0xFFFF) ^ 0xFFFF)>>9; filter[i+1] = (((xpos+xInc ) & 0xFFFF) ^ 0xFFFF)>>9;
@ -1900,30 +1902,25 @@ static void initMMX2HScaler(int dstW, int xInc, uint8_t *funnyCode, int16_t *fil
filter[i+3] = (((xpos+xInc*3) & 0xFFFF) ^ 0xFFFF)>>9; filter[i+3] = (((xpos+xInc*3) & 0xFFFF) ^ 0xFFFF)>>9;
filterPos[i/2]= xx; filterPos[i/2]= xx;
memcpy(funnyCode + fragmentPos, fragment, fragmentLength);
funnyCode[fragmentPos + imm8OfPShufW1]=
(a+inc) | ((b+inc)<<2) | ((c+inc)<<4) | ((d+inc)<<6);
funnyCode[fragmentPos + imm8OfPShufW2]=
a | (b<<2) | (c<<4) | (d<<6);
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)
{ {
int maxShift= 3-(d+inc); funnyCode[fragmentPos + imm8OfPShufW1]+= 0x55*shift;
int shift=0; funnyCode[fragmentPos + imm8OfPShufW2]+= 0x55*shift;
filterPos[i/2]-=shift;
memcpy(funnyCode + fragmentPos, fragment, fragmentLength);
funnyCode[fragmentPos + imm8OfPShufW1]=
(a+inc) | ((b+inc)<<2) | ((c+inc)<<4) | ((d+inc)<<6);
funnyCode[fragmentPos + imm8OfPShufW2]=
a | (b<<2) | (c<<4) | (d<<6);
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)
{
funnyCode[fragmentPos + imm8OfPShufW1]+= 0x55*shift;
funnyCode[fragmentPos + imm8OfPShufW2]+= 0x55*shift;
filterPos[i/2]-=shift;
}
fragmentPos+= fragmentLength;
} }
fragmentPos+= fragmentLength;
funnyCode[fragmentPos]= RET; funnyCode[fragmentPos]= RET;
} }
xpos+=xInc; xpos+=xInc;