diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-10-23 19:19:57 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-10-23 19:31:55 +0200 |
| commit | 76a349067271577d01ae09e040cd7a1e0866a3c9 (patch) | |
| tree | 4d440831ec6973868f75ab65576b710a0714a370 /libswscale/swscale.c | |
| parent | 74fdb7a0f814c77507b22765f7e3bef861a7d006 (diff) | |
| download | ffmpeg-76a349067271577d01ae09e040cd7a1e0866a3c9.tar.gz | |
sws: add yuv2yuvX() back and updated to the just 1 plane API
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale/swscale.c')
| -rw-r--r-- | libswscale/swscale.c | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/libswscale/swscale.c b/libswscale/swscale.c index a94be88e45..502cb438da 100644 --- a/libswscale/swscale.c +++ b/libswscale/swscale.c @@ -2563,6 +2563,7 @@ static int swScale(SwsContext *c, const uint8_t* src[], dst[2] + dstStride[2] * chrDstY, (CONFIG_SWSCALE_ALPHA && alpPixBuf) ? dst[3] + dstStride[3] * dstY : NULL, }; + int use_mmx_vfilter= c->use_mmx_vfilter; const int firstLumSrcY= vLumFilterPos[dstY]; //First line needed as input const int firstLumSrcY2= vLumFilterPos[FFMIN(dstY | ((1<<c->chrDstVSubSample) - 1), dstH-1)]; @@ -2653,6 +2654,7 @@ static int swScale(SwsContext *c, const uint8_t* src[], // hmm looks like we can't use MMX here without overwriting this array's tail find_c_packed_planar_out_funcs(c, &yuv2plane1, &yuv2planeX, &yuv2nv12cX, &yuv2packed1, &yuv2packed2, &yuv2packedX); + use_mmx_vfilter= 0; } { @@ -2669,6 +2671,19 @@ static int swScale(SwsContext *c, const uint8_t* src[], vLumFilter += dstY * vLumFilterSize; vChrFilter += chrDstY * vChrFilterSize; + av_assert0(use_mmx_vfilter != ( + yuv2planeX == yuv2planeX_10BE_c + || yuv2planeX == yuv2planeX_10LE_c + || yuv2planeX == yuv2planeX_9BE_c + || yuv2planeX == yuv2planeX_9LE_c + || yuv2planeX == yuv2planeX_16BE_c + || yuv2planeX == yuv2planeX_16LE_c + || yuv2planeX == yuv2planeX_8_c)); + if(use_mmx_vfilter){ + vLumFilter= c->lumMmxFilter; + vChrFilter= c->chrMmxFilter; + } + if (vLumFilterSize == 1) { yuv2plane1(lumSrcPtr[0], dest[0], dstW, c->lumDither8, 0); } else { @@ -2686,11 +2701,14 @@ static int swScale(SwsContext *c, const uint8_t* src[], yuv2planeX(vChrFilter, vChrFilterSize, chrUSrcPtr, dest[1], chrDstW, c->chrDither8, 0); yuv2planeX(vChrFilter, vChrFilterSize, - chrVSrcPtr, dest[2], chrDstW, c->chrDither8, 3); + chrVSrcPtr, dest[2], chrDstW, c->chrDither8, use_mmx_vfilter ? (c->uv_offx2 >> 1) : 3); } } if (CONFIG_SWSCALE_ALPHA && alpPixBuf){ + if(use_mmx_vfilter){ + vLumFilter= c->alpMmxFilter; + } if (vLumFilterSize == 1) { yuv2plane1(alpSrcPtr[0], dest[3], dstW, c->lumDither8, 0); } else { |