[xine-cvs] CVS: xine-lib/src/xine-engine buffer.h,1.13,1.14

[J?rgen K. <jk...@us...>]

Update of /cvsroot/xine/xine-lib/src/xine-engine
In directory usw-pr-cvs1:/tmp/cvs-serv15702/xine-engine

Modified Files:
	buffer.h 
Log Message:
ffmpeg apparently does not support MSMPEG4 v1/v2 format yet.  Trying to handle
MSMPEG4 v1/v2 formats using the libw32dll plugin. 

But at least for XShm video output, libw32dll is too slow, converting
RGB -> YUY2 in the w32dll plugin, and converting back from YUY2 -> RGB in
the video out driver :-/


Index: buffer.h
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/xine-engine/buffer.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- buffer.h	2001/09/12 22:18:47	1.13
+++ buffer.h	2001/09/18 17:41:48	1.14
@@ -71,48 +71,49 @@
 
 /* video buffer types:  */
 
-#define BUF_VIDEO_BASE       0x02000000
-#define BUF_VIDEO_MPEG       0x02000000
-#define BUF_VIDEO_MPEG4      0x02010000
-#define BUF_VIDEO_CINEPAK    0x02020000
-#define BUF_VIDEO_SORENSON   0x02030000
-#define BUF_VIDEO_MSMPEG4    0x02040000
-#define BUF_VIDEO_MJPEG      0x02050000
-#define BUF_VIDEO_IV50       0x02060000
-#define BUF_VIDEO_IV41       0x02070000
-#define BUF_VIDEO_IV32       0x02080000
-#define BUF_VIDEO_IV31       0x02090000
-#define BUF_VIDEO_ATIVCR1    0x020a0000
-#define BUF_VIDEO_ATIVCR2    0x020b0000
-#define BUF_VIDEO_I263       0x020c0000
-#define BUF_VIDEO_RV10       0x020d0000
-#define BUF_VIDEO_FILL       0x020e0000
-#define BUF_VIDEO_RGB        0x020f0000
-#define BUF_VIDEO_YUY2       0x02100000
-#define BUF_VIDEO_JPEG       0x02110000
+#define BUF_VIDEO_BASE		0x02000000
+#define BUF_VIDEO_MPEG		0x02000000
+#define BUF_VIDEO_MPEG4		0x02010000
+#define BUF_VIDEO_CINEPAK	0x02020000
+#define BUF_VIDEO_SORENSON	0x02030000
+#define BUF_VIDEO_MSMPEG4_V12	0x02040000
+#define BUF_VIDEO_MSMPEG4_V3	0x02050000
+#define BUF_VIDEO_MJPEG		0x02060000
+#define BUF_VIDEO_IV50		0x02070000
+#define BUF_VIDEO_IV41		0x02080000
+#define BUF_VIDEO_IV32		0x02090000
+#define BUF_VIDEO_IV31		0x020a0000
+#define BUF_VIDEO_ATIVCR1	0x020b0000
+#define BUF_VIDEO_ATIVCR2	0x020c0000
+#define BUF_VIDEO_I263		0x020d0000
+#define BUF_VIDEO_RV10		0x020e0000
+#define BUF_VIDEO_FILL		0x020f0000
+#define BUF_VIDEO_RGB		0x02100000
+#define BUF_VIDEO_YUY2		0x02110000
+#define BUF_VIDEO_JPEG		0x02120000
 
 /* audio buffer types:  */
 
-#define BUF_AUDIO_BASE       0x03000000
-#define BUF_AUDIO_A52        0x03000000
-#define BUF_AUDIO_MPEG       0x03010000
-#define BUF_AUDIO_LPCM_BE    0x03020000
-#define BUF_AUDIO_LPCM_LE    0x03030000
-#define BUF_AUDIO_DIVXA      0x03040000
-#define BUF_AUDIO_DTS        0x03050000
-#define BUF_AUDIO_MSADPCM    0x03060000
-#define BUF_AUDIO_IMAADPCM   0x03070000
-#define BUF_AUDIO_MSGSM      0x03080000 
+#define BUF_AUDIO_BASE		0x03000000
+#define BUF_AUDIO_A52		0x03000000
+#define BUF_AUDIO_MPEG		0x03010000
+#define BUF_AUDIO_LPCM_BE	0x03020000
+#define BUF_AUDIO_LPCM_LE	0x03030000
+#define BUF_AUDIO_DIVXA		0x03040000
+#define BUF_AUDIO_DTS		0x03050000
+#define BUF_AUDIO_MSADPCM	0x03060000
+#define BUF_AUDIO_IMAADPCM	0x03070000
+#define BUF_AUDIO_MSGSM		0x03080000 
 
 /* spu buffer types:    */
  
-#define BUF_SPU_BASE         0x04000000
-#define BUF_SPU_CLUT         0x04000000
-#define BUF_SPU_PACKAGE      0x04010000
+#define BUF_SPU_BASE		0x04000000
+#define BUF_SPU_CLUT		0x04000000
+#define BUF_SPU_PACKAGE		0x04010000
 
 /* demuxer block types: */
 
-#define BUF_DEMUX_BLOCK      0x05000000
+#define BUF_DEMUX_BLOCK		0x05000000
 
 typedef struct buf_element_s buf_element_t;
 struct buf_element_s {