summaryrefslogtreecommitdiff
path: root/src/xine-engine/buffer.h
diff options
context:
space:
mode:
authorJuergen Keil <jkeil@users.sourceforge.net>2001-09-18 17:41:47 +0000
committerJuergen Keil <jkeil@users.sourceforge.net>2001-09-18 17:41:47 +0000
commit74158ab4d5dc283712729062fdcf732780ac13a8 (patch)
tree1e871996fcd9e03bcd1a34a13017863f8efb05df /src/xine-engine/buffer.h
parentdd024e53aa2901d46eaa1da89da5fad14a67f703 (diff)
downloadxine-lib-74158ab4d5dc283712729062fdcf732780ac13a8.tar.gz
xine-lib-74158ab4d5dc283712729062fdcf732780ac13a8.tar.bz2
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 :-/ CVS patchset: 661 CVS date: 2001/09/18 17:41:47
Diffstat (limited to 'src/xine-engine/buffer.h')
-rw-r--r--src/xine-engine/buffer.h69
1 files changed, 35 insertions, 34 deletions
diff --git a/src/xine-engine/buffer.h b/src/xine-engine/buffer.h
index d8cd73690..abed6122d 100644
--- a/src/xine-engine/buffer.h
+++ b/src/xine-engine/buffer.h
@@ -17,7 +17,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: buffer.h,v 1.13 2001/09/12 22:18:47 guenter Exp $
+ * $Id: buffer.h,v 1.14 2001/09/18 17:41:48 jkeil Exp $
*
*
* contents:
@@ -71,48 +71,49 @@ extern "C" {
/* 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 {