Mask all unused bits for packed pixel format instead of green and alpha mask only.

[ffmpeg] / libswscale / yuv2rgb_mlib.c

diff --git a/libswscale/yuv2rgb_mlib.c b/libswscale/yuv2rgb_mlib.c
index b19c2a5d1893a7e19cbd124a1744eb0fc39e4ea4..68247914e72411332b9523d5d1b033f961d02fc9 100644 (file)
--- a/libswscale/yuv2rgb_mlib.c
+++ b/libswscale/yuv2rgb_mlib.c
@@ -1,25 +1,23 @@
-/* 
- * yuv2rgb_mlib.c, Software YUV to RGB coverter using mediaLib
+/*
+ * software YUV to RGB converter using mediaLib
  *
- *  Copyright (C) 2000, Håkan Hjort <d95hjort@dtek.chalmers.se>
- *  All Rights Reserved.
+ * Copyright (C) 2003 Michael Niedermayer <michaelni@gmx.at>
  *
- *  This file is part of mpeg2dec, a free MPEG-2 video decoder
+ * This file is part of FFmpeg.
  *
- *  mpeg2dec is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- *  mpeg2dec is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with GNU Make; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
  *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include <mlib_types.h>
@@ -30,59 +28,58 @@
 #include <stdlib.h>
 #include <assert.h>
 
-#include "libvo/img_format.h" //FIXME try to reduce dependency of such stuff
 #include "swscale.h"
 
-static int mlib_YUV2ARGB420_32(SwsContext *c, uint8_t* src[], int srcStride[], int srcSliceY, 
-             int srcSliceH, uint8_t* dst[], int dstStride[]){
-    if(c->srcFormat == IMGFMT_422P){
-       srcStride[1] *= 2;
-       srcStride[2] *= 2;
+static int mlib_YUV2ARGB420_32(SwsContext *c, uint8_t* src[], int srcStride[], int srcSliceY,
+                               int srcSliceH, uint8_t* dst[], int dstStride[]){
+    if(c->srcFormat == PIX_FMT_YUV422P){
+        srcStride[1] *= 2;
+        srcStride[2] *= 2;
     }
-    
+
     assert(srcStride[1] == srcStride[2]);
- 
+
     mlib_VideoColorYUV2ARGB420(dst[0]+srcSliceY*dstStride[0], src[0], src[1], src[2], c->dstW,
-                            srcSliceH, dstStride[0], srcStride[0], srcStride[1]);
+                               srcSliceH, dstStride[0], srcStride[0], srcStride[1]);
     return srcSliceH;
 }
 
-static int mlib_YUV2ABGR420_32(SwsContext *c, uint8_t* src[], int srcStride[], int srcSliceY, 
-             int srcSliceH, uint8_t* dst[], int dstStride[]){
-    if(c->srcFormat == IMGFMT_422P){
-       srcStride[1] *= 2;
-       srcStride[2] *= 2;
+static int mlib_YUV2ABGR420_32(SwsContext *c, uint8_t* src[], int srcStride[], int srcSliceY,
+                               int srcSliceH, uint8_t* dst[], int dstStride[]){
+    if(c->srcFormat == PIX_FMT_YUV422P){
+        srcStride[1] *= 2;
+        srcStride[2] *= 2;
     }
-    
+
     assert(srcStride[1] == srcStride[2]);
- 
+
     mlib_VideoColorYUV2ABGR420(dst[0]+srcSliceY*dstStride[0], src[0], src[1], src[2], c->dstW,
-                            srcSliceH, dstStride[0], srcStride[0], srcStride[1]);
+                               srcSliceH, dstStride[0], srcStride[0], srcStride[1]);
     return srcSliceH;
 }
 
-static int mlib_YUV2RGB420_24(SwsContext *c, uint8_t* src[], int srcStride[], int srcSliceY, 
-             int srcSliceH, uint8_t* dst[], int dstStride[]){
-    if(c->srcFormat == IMGFMT_422P){
-       srcStride[1] *= 2;
-       srcStride[2] *= 2;
+static int mlib_YUV2RGB420_24(SwsContext *c, uint8_t* src[], int srcStride[], int srcSliceY,
+                              int srcSliceH, uint8_t* dst[], int dstStride[]){
+    if(c->srcFormat == PIX_FMT_YUV422P){
+        srcStride[1] *= 2;
+        srcStride[2] *= 2;
     }
-    
+
     assert(srcStride[1] == srcStride[2]);
- 
+
     mlib_VideoColorYUV2RGB420(dst[0]+srcSliceY*dstStride[0], src[0], src[1], src[2], c->dstW,
-                            srcSliceH, dstStride[0], srcStride[0], srcStride[1]);
+                              srcSliceH, dstStride[0], srcStride[0], srcStride[1]);
     return srcSliceH;
 }
 
 
-SwsFunc yuv2rgb_init_mlib(SwsContext *c) 
+SwsFunc sws_yuv2rgb_init_mlib(SwsContext *c)
 {
-       switch(c->dstFormat){
-       case IMGFMT_RGB24: return mlib_YUV2RGB420_24;
-       case IMGFMT_RGB32: return mlib_YUV2ARGB420_32;
-       case IMGFMT_BGR32: return mlib_YUV2ABGR420_32;
-       default: return NULL;
-       }
+    switch(c->dstFormat){
+    case PIX_FMT_RGB24: return mlib_YUV2RGB420_24;
+    case PIX_FMT_BGR32: return mlib_YUV2ARGB420_32;
+    case PIX_FMT_RGB32: return mlib_YUV2ABGR420_32;
+    default: return NULL;
+    }
 }