Mercurial > mplayer.hg
changeset 6580:5059143aa020
-sws 6 (luma bicubic & chroma bilinear)
| author | michael |
|---|---|
| date | Thu, 27 Jun 2002 19:17:25 +0000 |
| parents | 6850df500b8c |
| children | 896c062e85ec |
| files | postproc/swscale.c postproc/swscale.h |
| diffstat | 2 files changed, 15 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/postproc/swscale.c Thu Jun 27 18:09:32 2002 +0000 +++ b/postproc/swscale.c Thu Jun 27 19:17:25 2002 +0000 @@ -257,6 +257,8 @@ IMGFMT_BGR16, IMGFMT_BGR24, IMGFMT_BGR32, +IMGFMT_RGB24, +IMGFMT_RGB32, //IMGFMT_Y8, IMGFMT_Y800, //IMGFMT_YUY2, @@ -940,6 +942,7 @@ case 3: *flags|= SWS_X; break; case 4: *flags|= SWS_POINT; break; case 5: *flags|= SWS_AREA; break; + case 6: *flags|= SWS_BICUBLIN; break; default:*flags|= SWS_BILINEAR; break; } @@ -2251,10 +2254,12 @@ const int filterAlign= cpuCaps.hasMMX ? 4 : 1; initFilter(&c->hLumFilter, &c->hLumFilterPos, &c->hLumFilterSize, c->lumXInc, - srcW , dstW, filterAlign, 1<<14, flags, + srcW , dstW, filterAlign, 1<<14, + (flags&SWS_BICUBLIN) ? (flags|SWS_BICUBIC) : flags, srcFilter->lumH, dstFilter->lumH); initFilter(&c->hChrFilter, &c->hChrFilterPos, &c->hChrFilterSize, c->chrXInc, - c->chrSrcW, c->chrDstW, filterAlign, 1<<14, flags, + c->chrSrcW, c->chrDstW, filterAlign, 1<<14, + (flags&SWS_BICUBLIN) ? (flags|SWS_BILINEAR) : flags, srcFilter->chrH, dstFilter->chrH); #ifdef ARCH_X86 @@ -2276,11 +2281,13 @@ /* precalculate vertical scaler filter coefficients */ initFilter(&c->vLumFilter, &c->vLumFilterPos, &c->vLumFilterSize, c->lumYInc, - srcH , dstH, 1, (1<<12)-4, flags, + srcH , dstH, 1, (1<<12)-4, + (flags&SWS_BICUBLIN) ? (flags|SWS_BICUBIC) : flags, srcFilter->lumV, dstFilter->lumV); initFilter(&c->vChrFilter, &c->vChrFilterPos, &c->vChrFilterSize, c->chrYInc, - c->chrSrcH, c->chrDstH, 1, (1<<12)-4, flags, - srcFilter->chrV, dstFilter->chrV); + c->chrSrcH, c->chrDstH, 1, (1<<12)-4, + (flags&SWS_BICUBLIN) ? (flags|SWS_BILINEAR) : flags, + srcFilter->chrV, dstFilter->chrV); // Calculate Buffer Sizes so that they wont run out while handling these damn slices c->vLumBufSize= c->vLumFilterSize; @@ -2344,6 +2351,8 @@ MSG_INFO("\nSwScaler: Nearest Neighbor / POINT scaler, "); else if(flags&SWS_AREA) MSG_INFO("\nSwScaler: Area Averageing scaler, "); + else if(flags&SWS_BICUBLIN) + MSG_INFO("\nSwScaler: luma BICUBIC / chroma BILINEAR, "); else MSG_INFO("\nSwScaler: ehh flags invalid?! ");