[Mplayer-cvslog] CVS: main/libvo2 img_format.c,1.1,1.2 img_format.h,1.1,1.2

[Nick Kurshev]

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

Modified Files:
	img_format.c img_format.h 
Log Message:
New ones

Index: img_format.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo2/img_format.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- img_format.c	31 Jul 2001 00:29:22 -0000	1.1
+++ img_format.c	29 Nov 2001 17:08:17 -0000	1.2
@@ -1,4 +1,3 @@
-
 #include "img_format.h"
 
 char *vo_format_name(int format)
@@ -21,11 +20,16 @@
 	case IMGFMT_I420: return("Planar I420");
 	case IMGFMT_IYUV: return("Planar IYUV");
 	case IMGFMT_CLPL: return("Planar CLPL");
+	case IMGFMT_Y800: return("Planar Y800");
+	case IMGFMT_Y8: return("Planar Y8");
+	case IMGFMT_IUYV: return("Packed IUYV");
+	case IMGFMT_IY41: return("Packed IY41");
 	case IMGFMT_IYU1: return("Packed IYU1");
 	case IMGFMT_IYU2: return("Packed IYU2");
 	case IMGFMT_UYVY: return("Packed UYVY");
 	case IMGFMT_UYNV: return("Packed UYNV");
 	case IMGFMT_cyuv: return("Packed CYUV");
+	case IMGFMT_Y422: return("Packed Y422");
 	case IMGFMT_YUY2: return("Packed YUY2");
 	case IMGFMT_YUNV: return("Packed YUNV");
 	case IMGFMT_YVYU: return("Packed YVYU");
@@ -38,6 +42,7 @@
 	case IMGFMT_CLJR: return("Packed CLJR");
 	case IMGFMT_YUVP: return("Packed YUVP");
 	case IMGFMT_UYVP: return("Packed UYVP");
+	case IMGFMT_MPEGPES: return("Mpeg PES");
     }
     return("Unknown");
 }

Index: img_format.h
===================================================================
RCS file: /cvsroot/mplayer/main/libvo2/img_format.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- img_format.h	31 Jul 2001 00:29:22 -0000	1.1
+++ img_format.h	29 Nov 2001 17:08:17 -0000	1.2
@@ -20,6 +20,12 @@
 #define IMGFMT_BGR24 (IMGFMT_BGR|24)
 #define IMGFMT_BGR32 (IMGFMT_BGR|32)
 
+#define IMGFMT_IS_RGB(fmt) ((fmt&IMGFMT_RGB_MASK)==IMGFMT_RGB)
+#define IMGFMT_IS_BGR(fmt) ((fmt&IMGFMT_BGR_MASK)==IMGFMT_BGR)
+
+#define IMGFMT_RGB_DEPTH(fmt) (fmt&~IMGFMT_RGB)
+#define IMGFMT_BGR_DEPTH(fmt) (fmt&~IMGFMT_BGR)
+
 
 /* Planar YUV Formats */
 
@@ -29,14 +35,19 @@
 #define IMGFMT_I420 0x30323449
 #define IMGFMT_IYUV 0x56555949
 #define IMGFMT_CLPL 0x4C504C43
+#define IMGFMT_Y800 0x30303859
+#define IMGFMT_Y8   0x20203859
 
 /* Packed YUV Formats */
 
+#define IMGFMT_IUYV 0x56595549
+#define IMGFMT_IY41 0x31435949
 #define IMGFMT_IYU1 0x31555949
 #define IMGFMT_IYU2 0x32555949
 #define IMGFMT_UYVY 0x59565955
 #define IMGFMT_UYNV 0x564E5955
 #define IMGFMT_cyuv 0x76757963
+#define IMGFMT_Y422 0x32323459
 #define IMGFMT_YUY2 0x32595559
 #define IMGFMT_YUNV 0x564E5559
 #define IMGFMT_YVYU 0x55595659
@@ -49,6 +60,16 @@
 #define IMGFMT_CLJR 0x524A4C43
 #define IMGFMT_YUVP 0x50565559
 #define IMGFMT_UYVP 0x50565955
+
+/* Compressed Formats */
+#define IMGFMT_MPEGPES (('M'<<24)|('P'<<16)|('E'<<8)|('S'))
+
+typedef struct {
+    void* data;
+    int size;
+    int id;        // stream id. usually 0x1E0
+    int timestamp; // pts, 90000 Hz counter based
+} vo_mpegpes_t;
 
 char *vo_format_name(int format);