diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2003-02-13 14:19:05 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2003-02-13 14:19:05 +0000 |
| commit | 77a4965980e333f3604eca2e77b645d1878494f8 (patch) | |
| tree | 6e05bac4a56f8c10711bbbbc58a9917b1dfab63e /postproc/swscale.c | |
| parent | d271b84bf7e5ab29d3f45a73392050ff4f424c64 (diff) | |
| download | ffmpeg-77a4965980e333f3604eca2e77b645d1878494f8.tar.gz | |
cleanup
Originally committed as revision 9414 to svn://svn.mplayerhq.hu/mplayer/trunk/postproc
Diffstat (limited to 'postproc/swscale.c')
| -rw-r--r-- | postproc/swscale.c | 27 |
1 files changed, 9 insertions, 18 deletions
diff --git a/postproc/swscale.c b/postproc/swscale.c index 6936f71b0b..044085b9d1 100644 --- a/postproc/swscale.c +++ b/postproc/swscale.c @@ -2019,6 +2019,15 @@ SwsContext *getSwsContext(int srcW, int srcH, int srcFormat, int dstW, int dstH, c->dstFormat= dstFormat; c->srcFormat= srcFormat; + c->yCoeff= 0x2568256825682568LL; + c->vrCoeff= 0x3343334333433343LL; + c->ubCoeff= 0x40cf40cf40cf40cfLL; + c->vgCoeff= 0xE5E2E5E2E5E2E5E2LL; + c->ugCoeff= 0xF36EF36EF36EF36ELL; + c->yOffset= 0x0080008000800080LL; + c->uOffset= 0x0400040004000400LL; + c->vOffset= 0x0400040004000400LL; + usesFilter=0; if(dstFilter->lumV!=NULL && dstFilter->lumV->length>1) usesFilter=1; if(dstFilter->lumH!=NULL && dstFilter->lumH->length>1) usesFilter=1; @@ -2261,19 +2270,6 @@ SwsContext *getSwsContext(int srcW, int srcH, int srcFormat, int dstW, int dstH, ASSERT(c->chrDstH <= dstH) - // pack filter data for mmx code - if(cpuCaps.hasMMX) - { - c->lumMmxFilter= (int16_t*)memalign(8, c->vLumFilterSize* dstH*4*sizeof(int16_t)); - c->chrMmxFilter= (int16_t*)memalign(8, c->vChrFilterSize*c->chrDstH*4*sizeof(int16_t)); - for(i=0; i<c->vLumFilterSize*dstH; i++) - c->lumMmxFilter[4*i]=c->lumMmxFilter[4*i+1]=c->lumMmxFilter[4*i+2]=c->lumMmxFilter[4*i+3]= - c->vLumFilter[i]; - for(i=0; i<c->vChrFilterSize*c->chrDstH; i++) - c->chrMmxFilter[4*i]=c->chrMmxFilter[4*i+1]=c->chrMmxFilter[4*i+2]=c->chrMmxFilter[4*i+3]= - c->vChrFilter[i]; - } - if(flags&SWS_PRINT_INFO) { #ifdef DITHER1XBPP @@ -2668,11 +2664,6 @@ void freeSwsContext(SwsContext *c){ if(c->hChrFilterPos) free(c->hChrFilterPos); c->hChrFilterPos = NULL; - if(c->lumMmxFilter) free(c->lumMmxFilter); - c->lumMmxFilter = NULL; - if(c->chrMmxFilter) free(c->chrMmxFilter); - c->chrMmxFilter = NULL; - if(c->lumMmx2Filter) free(c->lumMmx2Filter); c->lumMmx2Filter=NULL; if(c->chrMmx2Filter) free(c->chrMmx2Filter); |