[MPlayer-cvslog] CVS: main/postproc yuv2rgb_altivec.c,1.12,1.13

[Alan Curry CVS]

CVS change done by Alan Curry CVS

Update of /cvsroot/mplayer/main/postproc
In directory mail:/var2/tmp/cvs-serv27351/postproc

Modified Files:
	yuv2rgb_altivec.c 
Log Message:
Support all 4 of ARGB/RGBA/BGRA/ABGR unscaled conversions, with more
consistent naming of functions


Index: yuv2rgb_altivec.c
===================================================================
RCS file: /cvsroot/mplayer/main/postproc/yuv2rgb_altivec.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- yuv2rgb_altivec.c	18 Feb 2006 01:08:17 -0000	1.12
+++ yuv2rgb_altivec.c	13 Mar 2006 03:46:25 -0000	1.13
@@ -417,9 +417,9 @@
 #define out_rgb24(a,b,c,ptr) vec_mstrgb24(a,b,c,ptr)
 #define out_bgr24(a,b,c,ptr) vec_mstbgr24(a,b,c,ptr)
 
-DEFCSP420_CVT (yuv2_abgr32, out_abgr)
+DEFCSP420_CVT (yuv2_abgr, out_abgr)
 #if 1
-DEFCSP420_CVT (yuv2_bgra32, out_argb)
+DEFCSP420_CVT (yuv2_bgra, out_bgra)
 #else
 static int altivec_yuv2_bgra32 (SwsContext *c,                                  
 				unsigned char **in, int *instrides,	   
@@ -571,8 +571,8 @@
 #endif
 
 
-DEFCSP420_CVT (yuv2_rgba32, out_rgba)
-DEFCSP420_CVT (yuv2_argb32, out_argb)
+DEFCSP420_CVT (yuv2_rgba, out_rgba)
+DEFCSP420_CVT (yuv2_argb, out_argb)
 DEFCSP420_CVT (yuv2_rgb24,  out_rgb24)
 DEFCSP420_CVT (yuv2_bgr24,  out_bgr24)
 
@@ -698,14 +698,18 @@
     case IMGFMT_BGR24:
       MSG_WARN("ALTIVEC: Color Space BGR24\n");
       return altivec_yuv2_bgr24;
-    case IMGFMT_RGB32:
-      MSG_WARN("ALTIVEC: Color Space ARGB32\n");
-      return altivec_yuv2_argb32;
-    case IMGFMT_BGR32:
-      MSG_WARN("ALTIVEC: Color Space BGRA32\n");
-      //      return profile_altivec_bgra32;
-
-      return altivec_yuv2_bgra32;
+    case IMGFMT_ARGB:
+      MSG_WARN("ALTIVEC: Color Space ARGB\n");
+      return altivec_yuv2_argb;
+    case IMGFMT_ABGR:
+      MSG_WARN("ALTIVEC: Color Space ABGR\n");
+      return altivec_yuv2_abgr;
+    case IMGFMT_RGBA:
+      MSG_WARN("ALTIVEC: Color Space RGBA\n");
+      return altivec_yuv2_rgba;
+    case IMGFMT_BGRA:
+      MSG_WARN("ALTIVEC: Color Space BGRA\n");
+      return altivec_yuv2_bgra;
     default: return NULL;
     }
     break;