[Mplayer-cvslog] CVS: main/libmpcodecs img_format.c,1.7,1.8 img_format.h,1.12,1.13 mp_image.h,1.23,1.24

[Ivan Kalvachev CVS]

Update of /cvsroot/mplayer/main/libmpcodecs
In directory mail:/var/tmp.root/cvs-serv20940/libmpcodecs

Modified Files:
	img_format.c img_format.h mp_image.h 
Log Message:
basic xvmc image support

Index: img_format.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/img_format.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- img_format.c	18 Jun 2003 00:34:34 -0000	1.7
+++ img_format.c	21 Jun 2003 01:47:25 -0000	1.8
@@ -54,6 +54,8 @@
 	case IMGFMT_YUVP: return("Packed YUVP");
 	case IMGFMT_UYVP: return("Packed UYVP");
 	case IMGFMT_MPEGPES: return("Mpeg PES");
+	case IMGFMT_XVMC_MOCO_MPEG2: return("MPEG1/2 Motion Compensation");
+	case IMGFMT_XVMC_IDCT_MPEG2: return("MPEG1/2 Motion Compensation and IDCT");
     }
     return("Unknown");
 }

Index: img_format.h
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/img_format.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- img_format.h	18 Jun 2003 00:34:34 -0000	1.12
+++ img_format.h	21 Jun 2003 01:47:25 -0000	1.13
@@ -77,6 +77,14 @@
 /* Compressed Formats */
 #define IMGFMT_MPEGPES (('M'<<24)|('P'<<16)|('E'<<8)|('S'))
 
+// I think that this code could not be used by any other codec/format
+#define IMGFMT_XVMC 0x1DC70000
+#define IMGFMT_XVMC_MASK 0xFFFF0000
+#define IMGFMT_IS_XVMC(fmt) (((fmt)&IMGFMT_XVMC_MASK)==IMGFMT_XVMC)
+//these are chroma420
+#define IMGFMT_XVMC_MOCO_MPEG2 (IMGFMT_XVMC|0x02)
+#define IMGFMT_XVMC_IDCT_MPEG2 (IMGFMT_XVMC|0x82)
+
 typedef struct {
     void* data;
     int size;

Index: mp_image.h
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/mp_image.h,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- mp_image.h	18 Apr 2003 13:18:59 -0000	1.23
+++ mp_image.h	21 Jun 2003 01:47:25 -0000	1.24
@@ -95,6 +95,10 @@
 	mpi->bpp=0;
 	return;
     }
+    if(IMGFMT_IS_XVMC(out_fmt)){
+	mpi->bpp=0;
+	return;
+    }
     mpi->num_planes=1;
     if (IMGFMT_IS_RGB(out_fmt)) {
 	if (IMGFMT_RGB_DEPTH(out_fmt) < 8 && !(out_fmt&128))