RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

minor bugfixes (noone noticed them) 

a few more asserts

Originally committed as revision 3642 to svn://svn.mplayerhq.hu/mplayer/trunk/postproc
This commit is contained in:
Michael Niedermayer 2001-12-21 02:09:34 +00:00
parent aa21f0c389
commit 627690b5a2
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
postproc/swscale.c
View File

@ -206,7 +206,7 @@ static inline void yuv2yuvXinC(int16_t *lumFilter, int16_t **lumSrc, int lumFilt
int u=0; int u=0;
int v=0; int v=0;
int j; int j;
for(j=0; j<lumFilterSize; j++) for(j=0; j<chrFilterSize; j++)
{ {
u += chrSrc[j][i] * chrFilter[j]; u += chrSrc[j][i] * chrFilter[j];
v += chrSrc[j][i + 2048] * chrFilter[j]; v += chrSrc[j][i + 2048] * chrFilter[j];

8
postproc/swscale_template.c
View File

@ -1558,8 +1558,8 @@ static inline void RENAME(hScale)(int16_t *dst, int dstW, uint8_t *src, int srcW
"addl $4, %0 \n\t" "addl $4, %0 \n\t"
" jnc 1b \n\t" " jnc 1b \n\t"
: "+r" (counter) : "+r" (counter), "+r" (filter)
: "r" (filter), "m" (filterPos), "m" (dst), "m"(src+filterSize), : "m" (filterPos), "m" (dst), "m"(src+filterSize),
"m" (src), "r" (filterSize*2) "m" (src), "r" (filterSize*2)
: "%ebx", "%eax", "%ecx" : "%ebx", "%eax", "%ecx"
); );
@ -2339,12 +2339,14 @@ else chrYInc= lumYInc>>1, chrDstH= dstH;
for(i=0; i<vLumBufSize; i++) memset(lumPixBuf[i], 0, 4000); for(i=0; i<vLumBufSize; i++) memset(lumPixBuf[i], 0, 4000);
for(i=0; i<vChrBufSize; i++) memset(chrPixBuf[i], 64, 8000); for(i=0; i<vChrBufSize; i++) memset(chrPixBuf[i], 64, 8000);
ASSERT(chrDstH<=dstH)
ASSERT(vLumFilterSize*dstH*4<16000)
ASSERT(vChrFilterSize*chrDstH*4<16000)
#ifdef HAVE_MMX #ifdef HAVE_MMX
// pack filter data for mmx code // pack filter data for mmx code
for(i=0; i<vLumFilterSize*dstH; i++) for(i=0; i<vLumFilterSize*dstH; i++)
lumMmxFilter[4*i]=lumMmxFilter[4*i+1]=lumMmxFilter[4*i+2]=lumMmxFilter[4*i+3]= lumMmxFilter[4*i]=lumMmxFilter[4*i+1]=lumMmxFilter[4*i+2]=lumMmxFilter[4*i+3]=
vLumFilter[i]; vLumFilter[i];
for(i=0; i<vChrFilterSize*chrDstH; i++) for(i=0; i<vChrFilterSize*chrDstH; i++)
chrMmxFilter[4*i]=chrMmxFilter[4*i+1]=chrMmxFilter[4*i+2]=chrMmxFilter[4*i+3]= chrMmxFilter[4*i]=chrMmxFilter[4*i+1]=chrMmxFilter[4*i+2]=chrMmxFilter[4*i+3]=
vChrFilter[i]; vChrFilter[i];