--- colorspace.c	2003/10/01 23:23:01	1.8.2.4
+++ colorspace.c	2005/11/22 10:23:01	1.11
@@ -19,7 +19,7 @@
  *  along with this program ; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  *
- * $Id: colorspace.c,v 1.8.2.4 2003/10/01 23:23:01 edgomez Exp $
+ * $Id: colorspace.c,v 1.11 2005/11/22 10:23:01 suxen_drol Exp $
  *
  ****************************************************************************/
 
@@ -37,7 +37,7 @@
 packedFuncPtr bgra_to_yv12;
 packedFuncPtr abgr_to_yv12;
 packedFuncPtr rgba_to_yv12;
-packedFuncPtr yuv_to_yv12;
+packedFuncPtr argb_to_yv12;
 packedFuncPtr yuyv_to_yv12;
 packedFuncPtr uyvy_to_yv12;
 
@@ -47,6 +47,7 @@
 packedFuncPtr bgrai_to_yv12;
 packedFuncPtr abgri_to_yv12;
 packedFuncPtr rgbai_to_yv12;
+packedFuncPtr argbi_to_yv12;
 packedFuncPtr yuyvi_to_yv12;
 packedFuncPtr uyvyi_to_yv12;
 
@@ -57,7 +58,7 @@
 packedFuncPtr yv12_to_bgra;
 packedFuncPtr yv12_to_abgr;
 packedFuncPtr yv12_to_rgba;
-packedFuncPtr yv12_to_yuv;
+packedFuncPtr yv12_to_argb;
 packedFuncPtr yv12_to_yuyv;
 packedFuncPtr yv12_to_uyvy;
 
@@ -67,17 +68,18 @@
 packedFuncPtr yv12_to_bgrai;
 packedFuncPtr yv12_to_abgri;
 packedFuncPtr yv12_to_rgbai;
+packedFuncPtr yv12_to_argbi;
 packedFuncPtr yv12_to_yuyvi;
 packedFuncPtr yv12_to_uyvyi;
 
 planarFuncPtr yv12_to_yv12;
 
 
-int32_t RGB_Y_tab[256];
-int32_t B_U_tab[256];
-int32_t G_U_tab[256];
-int32_t G_V_tab[256];
-int32_t R_V_tab[256];
+static int32_t RGB_Y_tab[256];
+static int32_t B_U_tab[256];
+static int32_t G_U_tab[256];
+static int32_t G_V_tab[256];
+static int32_t R_V_tab[256];
 
 
 
@@ -288,6 +290,7 @@
 MAKE_COLORSPACE(bgra_to_yv12_c,    4,2,2, RGB_TO_YV12,    2,1,0, 0)
 MAKE_COLORSPACE(abgr_to_yv12_c,    4,2,2, RGB_TO_YV12,    3,2,1, 0)
 MAKE_COLORSPACE(rgba_to_yv12_c,    4,2,2, RGB_TO_YV12,    0,1,2, 0)
+MAKE_COLORSPACE(argb_to_yv12_c,    4,2,2, RGB_TO_YV12,    1,2,3, 0)
 MAKE_COLORSPACE(yuyv_to_yv12_c,    2,2,2, YUYV_TO_YV12,   0,1,2,3)
 MAKE_COLORSPACE(uyvy_to_yv12_c,    2,2,2, YUYV_TO_YV12,   1,0,3,2)
 
@@ -297,6 +300,7 @@
 MAKE_COLORSPACE(bgrai_to_yv12_c,   4,2,4, RGBI_TO_YV12,   2,1,0, 0)
 MAKE_COLORSPACE(abgri_to_yv12_c,   4,2,4, RGBI_TO_YV12,   3,2,1, 0)
 MAKE_COLORSPACE(rgbai_to_yv12_c,   4,2,4, RGBI_TO_YV12,   0,1,2, 0)
+MAKE_COLORSPACE(argbi_to_yv12_c,   4,2,4, RGBI_TO_YV12,   1,2,3, 0)
 MAKE_COLORSPACE(yuyvi_to_yv12_c,   2,2,4, YUYVI_TO_YV12,  0,1,2,3)
 MAKE_COLORSPACE(uyvyi_to_yv12_c,   2,2,4, YUYVI_TO_YV12,  1,0,3,2)
 
@@ -333,12 +337,12 @@
 	((MAX(0,MIN(255, B)) >> 3) & 0x001f)
 
 #define WRITE_RGB16(ROW,UV_ROW,C1)	\
-	rgb_y = RGB_Y_tab[ y_ptr[y_stride + 0] ];			\
+	rgb_y = RGB_Y_tab[ y_ptr[y_stride*(ROW) + 0] ];						\
 	b[ROW] = (b[ROW] & 0x7) + ((rgb_y + b_u##UV_ROW) >> SCALEBITS_OUT);	\
 	g[ROW] = (g[ROW] & 0x7) + ((rgb_y - g_uv##UV_ROW) >> SCALEBITS_OUT);	\
 	r[ROW] = (r[ROW] & 0x7) + ((rgb_y + r_v##UV_ROW) >> SCALEBITS_OUT);		\
 	*(uint16_t *) (x_ptr+((ROW)*x_stride)+0) = C1(r[ROW], g[ROW], b[ROW]);	\
-	rgb_y = RGB_Y_tab[ y_ptr[y_stride + 1] ];				\
+	rgb_y = RGB_Y_tab[ y_ptr[y_stride*(ROW) + 1] ];				\
 	b[ROW] = (b[ROW] & 0x7) + ((rgb_y + b_u##UV_ROW) >> SCALEBITS_OUT);		\
 	g[ROW] = (g[ROW] & 0x7) + ((rgb_y - g_uv##UV_ROW) >> SCALEBITS_OUT);	\
 	r[ROW] = (r[ROW] & 0x7) + ((rgb_y + r_v##UV_ROW) >> SCALEBITS_OUT);		\
@@ -440,6 +444,7 @@
 MAKE_COLORSPACE(yv12_to_bgra_c,    4,2,2, YV12_TO_RGB,	  2,1,0,3)
 MAKE_COLORSPACE(yv12_to_abgr_c,    4,2,2, YV12_TO_RGB,    3,2,1,0)
 MAKE_COLORSPACE(yv12_to_rgba_c,    4,2,2, YV12_TO_RGB,    0,1,2,3)
+MAKE_COLORSPACE(yv12_to_argb_c,    4,2,2, YV12_TO_RGB,    1,2,3,0)
 MAKE_COLORSPACE(yv12_to_yuyv_c,    2,2,2, YV12_TO_YUYV,   0,1,2,3)
 MAKE_COLORSPACE(yv12_to_uyvy_c,    2,2,2, YV12_TO_YUYV,   1,0,3,2)
 
@@ -449,6 +454,7 @@
 MAKE_COLORSPACE(yv12_to_bgrai_c,   4,2,4, YV12_TO_RGBI,	  2,1,0,3)
 MAKE_COLORSPACE(yv12_to_abgri_c,   4,2,4, YV12_TO_RGBI,   3,2,1,0)
 MAKE_COLORSPACE(yv12_to_rgbai_c,   4,2,4, YV12_TO_RGBI,   0,1,2,3)
+MAKE_COLORSPACE(yv12_to_argbi_c,   4,2,4, YV12_TO_RGBI,   1,2,3,0)
 MAKE_COLORSPACE(yv12_to_yuyvi_c,   2,2,4, YV12_TO_YUYVI,  0,1,2,3)
 MAKE_COLORSPACE(yv12_to_uyvyi_c,   2,2,4, YV12_TO_YUYVI,  1,0,3,2)