diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2003-11-04 13:52:12 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2003-11-04 13:52:12 +0000 |
| commit | ec62c38fd57d8276e235ca7d95d785850dc93bf8 (patch) | |
| tree | bf905181f6dc875f74de6f48e1d76ae469ccf994 | |
| parent | 28c70622ecd34626af6b451939e7829cd9a0b6bb (diff) | |
| download | ffmpeg-ec62c38fd57d8276e235ca7d95d785850dc93bf8.tar.gz | |
-sws 0 && -ssf chs fixed
Originally committed as revision 11380 to svn://svn.mplayerhq.hu/mplayer/trunk/postproc
| -rw-r--r-- | postproc/swscale.c | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/postproc/swscale.c b/postproc/swscale.c index 508bf01497..9b9d98f795 100644 --- a/postproc/swscale.c +++ b/postproc/swscale.c @@ -1710,7 +1710,7 @@ SwsContext *sws_getContext(int srcW, int srcH, int origSrcFormat, int dstW, int SwsContext *c; int i; - int usesFilter; + int usesVFilter, usesHFilter; int unscaled, needsDither; int srcFormat, dstFormat; SwsFilter dummyFilter= {NULL, NULL, NULL, NULL}; @@ -1779,15 +1779,15 @@ SwsContext *sws_getContext(int srcW, int srcH, int origSrcFormat, int dstW, int c->origSrcFormat= origSrcFormat; c->vRounder= 4* 0x0001000100010001ULL; - usesFilter=0; - if(dstFilter->lumV!=NULL && dstFilter->lumV->length>1) usesFilter=1; - if(dstFilter->lumH!=NULL && dstFilter->lumH->length>1) usesFilter=1; - if(dstFilter->chrV!=NULL && dstFilter->chrV->length>1) usesFilter=1; - if(dstFilter->chrH!=NULL && dstFilter->chrH->length>1) usesFilter=1; - if(srcFilter->lumV!=NULL && srcFilter->lumV->length>1) usesFilter=1; - if(srcFilter->lumH!=NULL && srcFilter->lumH->length>1) usesFilter=1; - if(srcFilter->chrV!=NULL && srcFilter->chrV->length>1) usesFilter=1; - if(srcFilter->chrH!=NULL && srcFilter->chrH->length>1) usesFilter=1; + usesHFilter= usesVFilter= 0; + if(dstFilter->lumV!=NULL && dstFilter->lumV->length>1) usesVFilter=1; + if(dstFilter->lumH!=NULL && dstFilter->lumH->length>1) usesHFilter=1; + if(dstFilter->chrV!=NULL && dstFilter->chrV->length>1) usesVFilter=1; + if(dstFilter->chrH!=NULL && dstFilter->chrH->length>1) usesHFilter=1; + if(srcFilter->lumV!=NULL && srcFilter->lumV->length>1) usesVFilter=1; + if(srcFilter->lumH!=NULL && srcFilter->lumH->length>1) usesHFilter=1; + if(srcFilter->chrV!=NULL && srcFilter->chrV->length>1) usesVFilter=1; + if(srcFilter->chrH!=NULL && srcFilter->chrH->length>1) usesHFilter=1; getSubSampleFactors(&c->chrSrcHSubSample, &c->chrSrcVSubSample, srcFormat); getSubSampleFactors(&c->chrDstHSubSample, &c->chrDstVSubSample, dstFormat); @@ -1815,7 +1815,7 @@ SwsContext *sws_getContext(int srcW, int srcH, int origSrcFormat, int dstW, int sws_setColorspaceDetails(c, Inverse_Table_6_9[SWS_CS_DEFAULT], 0, Inverse_Table_6_9[SWS_CS_DEFAULT] /* FIXME*/, 0, 0, 1<<16, 1<<16); /* unscaled special Cases */ - if(unscaled && !usesFilter) + if(unscaled && !usesHFilter && !usesVFilter) { /* yv12_to_nv12 */ if(srcFormat == IMGFMT_YV12 && dstFormat == IMGFMT_NV12) @@ -1887,6 +1887,7 @@ SwsContext *sws_getContext(int srcW, int srcH, int origSrcFormat, int dstW, int if(flags&SWS_PRINT_INFO) MSG_INFO("SwScaler: output Width is not a multiple of 32 -> no MMX2 scaler\n"); } + if(usesHFilter) c->canMMX2BeUsed=0; } else c->canMMX2BeUsed=0; |