[Mplayer-cvslog] CVS: main xacodec.c,1.6,1.7

[Arpi of Ize]

Update of /cvsroot/mplayer/main
In directory mplayer:/var/tmp.root/cvs-serv23998

Modified Files:
	xacodec.c 
Log Message:
hmm. 3ivx works

Index: xacodec.c
===================================================================
RCS file: /cvsroot/mplayer/main/xacodec.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xacodec.c	22 Oct 2001 21:03:25 -0000	1.6
+++ xacodec.c	22 Oct 2001 21:31:42 -0000	1.7
@@ -270,8 +270,10 @@
 	case IMGFMT_BGR32:
 	    codec_hdr.depth = 32;
 	    break;
+	case IMGFMT_IYUV:
 	case IMGFMT_I420:
-	    codec_hdr.depth = 32;
+	case IMGFMT_YV12:
+	    codec_hdr.depth = 12;
 	    break;
 	default:
 	    mp_msg(MSGT_DECVIDEO, MSGL_FATAL, "xacodec: not supported image format (%s)\n",
@@ -705,11 +707,39 @@
     return((void *)color_func);
 }
 
+void XA_YUV221111_To_CLR8(image,imagex,imagey,i_x,i_y,yuv,yuv_tabs,map_flag,map,chdr)
+xaUBYTE *image;		xaULONG imagex,imagey,i_x,i_y;
+YUVBufs *yuv;	YUVTabs *yuv_tabs;
+xaULONG map_flag,*map;	XA_CHDR *chdr;
+{
+    printf("XA_YUV221111_To_CLR8(%p  %dx%d %d;%d  %p %p %d %p %p)\n",
+	image,imagex,imagey,i_x,i_y,yuv,yuv_tabs,map_flag,map,chdr);
+
+    printf("YUV: %p %p %p %X (%X) %Xx%X %Xx%X\n",
+	yuv->Ybuf,yuv->Ubuf,yuv->Vbuf,yuv->the_buf,yuv->the_buf_size,
+	yuv->y_w,yuv->y_h,yuv->uv_w,yuv->uv_h);
+
+    memcpy(image,yuv->Ybuf,imagex*imagey);
+    memcpy(image+imagex*imagey,yuv->Vbuf,imagex*imagey/4);
+    memcpy(image+imagex*imagey*5/4,yuv->Ubuf,imagex*imagey/4);
+
+/*
+    unsigned char *Ybuf;
+    unsigned char *Ubuf;
+    unsigned char *Vbuf;
+    unsigned char *the_buf;
+    unsigned int the_buf_size;
+    unsigned short y_w, y_h;
+    unsigned short uv_w, uv_h;
+*/
+
+}
+
 /* YUV 22 11 11 routines */
 void *XA_YUV221111_Func(unsigned int image_type)
 {
     XA_Print("XA_YUV221111_Func('image_type: %d')", image_type);    
-    return((void *)XA_dummy);
+    return((void *)XA_YUV221111_To_CLR8);
 }
 
 YUVBufs jpg_YUVBufs;