Mercurial > mplayer.hg

changeset 29013:fa95462d62ca

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Adds "YUYV422 to YUVA420P" and "UYVY422 to YUVA420P" unscaled convertion
author sdrik
date Tue, 24 Mar 2009 07:11:35 +0000
parents 8273eda1388c
children d0329d65c7fd
files libswscale/swscale.c
diffstat 1 files changed, 8 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/libswscale/swscale.c	Tue Mar 24 07:10:19 2009 +0000
+++ b/libswscale/swscale.c	Tue Mar 24 07:11:35 2009 +0000
@@ -1885,6 +1885,9 @@
 
     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 @@
 
     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 @@
                     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;