diff options
| author | Cédric Schieli <cschieli@gmail.com> | 2009-03-24 07:11:35 +0000 |
|---|---|---|
| committer | Cédric Schieli <cschieli@gmail.com> | 2009-03-24 07:11:35 +0000 |
| commit | 4626ee1a8ce17e93a37dd1c70c63256632cee281 (patch) | |
| tree | 66ab62725de35facab63797b2c6cead943f42b68 | |
| parent | 08218e6d8304f7fa5616ab71b9b348bcb9f6587b (diff) | |
| download | ffmpeg-4626ee1a8ce17e93a37dd1c70c63256632cee281.tar.gz | |
Adds "YUYV422 to YUVA420P" and "UYVY422 to YUVA420P" unscaled convertion
Originally committed as revision 29048 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
| -rw-r--r-- | libswscale/swscale.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/libswscale/swscale.c b/libswscale/swscale.c index c9e56cc3d9..316f4517e4 100644 --- a/libswscale/swscale.c +++ b/libswscale/swscale.c @@ -1885,6 +1885,9 @@ static int YUYV2YUV420Wrapper(SwsContext *c, uint8_t* src[], int srcStride[], in yuyvtoyuv420(ydst, udst, vdst, src[0], c->srcW, srcSliceH, dstStride[0], dstStride[1], srcStride[0]); + if (dstParam[3]) + fillPlane(dstParam[3], dstStride[3], c->srcW, srcSliceH, srcSliceY, 255); + return srcSliceH; } @@ -1907,6 +1910,9 @@ static int UYVY2YUV420Wrapper(SwsContext *c, uint8_t* src[], int srcStride[], in uyvytoyuv420(ydst, udst, vdst, src[0], c->srcW, srcSliceH, dstStride[0], dstStride[1], srcStride[0]); + if (dstParam[3]) + fillPlane(dstParam[3], dstStride[3], c->srcW, srcSliceH, srcSliceY, 255); + return srcSliceH; } @@ -2582,9 +2588,9 @@ SwsContext *sws_getContext(int srcW, int srcH, enum PixelFormat srcFormat, int d c->swScale= PlanarToUyvyWrapper; } } - if(srcFormat == PIX_FMT_YUYV422 && dstFormat == PIX_FMT_YUV420P) + if(srcFormat == PIX_FMT_YUYV422 && (dstFormat == PIX_FMT_YUV420P || dstFormat == PIX_FMT_YUVA420P)) c->swScale= YUYV2YUV420Wrapper; - if(srcFormat == PIX_FMT_UYVY422 && dstFormat == PIX_FMT_YUV420P) + if(srcFormat == PIX_FMT_UYVY422 && (dstFormat == PIX_FMT_YUV420P || dstFormat == PIX_FMT_YUVA420P)) c->swScale= UYVY2YUV420Wrapper; if(srcFormat == PIX_FMT_YUYV422 && dstFormat == PIX_FMT_YUV422P) c->swScale= YUYV2YUV422Wrapper; |