--- xvid.h	2002/06/13 12:42:18	1.10
+++ xvid.h	2002/10/17 19:10:31	1.17.2.3
@@ -28,7 +28,7 @@
 *               ToDo ? : when BFRAMES is defined, the API_VERSION should not
 *                        be the same (3.0 ?)
 *
-*  $Id: xvid.h,v 1.10 2002/06/13 12:42:18 edgomez Exp $
+*  $Id: xvid.h,v 1.17.2.3 2002/10/17 19:10:31 Isibaar Exp $
 *
 *****************************************************************************/
 
@@ -37,7 +37,7 @@
 #define _XVID_H_
 
 #ifdef __cplusplus
-*  $Id: xvid.h,v 1.10 2002/06/13 12:42:18 edgomez Exp $
+extern "C" {
 #endif
 
 /*****************************************************************************
@@ -47,6 +47,19 @@
 /* API Version : 2.1 */
 #define API_VERSION ((2 << 16) | (1))
 
+/* Bitstream Version 
+ * this will be writen into the bitstream to allow easy detection of xvid 
+ * encoder bugs in the decoder, without this it might not possible to 
+ * automatically distinquish between a file which has been encoded with an 
+ * old & buggy XVID from a file which has been encoded with a bugfree version
+ * see the infamous interlacing bug ...
+ *
+ * this MUST be increased if an encoder bug is fixed, increasing it too often
+ * doesnt hurt but not increasing it could cause difficulty for decoders in the
+ * future
+ */
+#define XVID_BS_VERSION "0001"
+
 
 /* Error codes */
 #define XVID_ERR_FAIL		-1
@@ -56,7 +69,7 @@
 
 
 /* Colorspaces */
-#define XVID_CSP_RGB24 	0
+#define XVID_CSP_RGB24 	0		/* [b|g|r] */
 #define XVID_CSP_YV12	1
 #define XVID_CSP_YUY2	2
 #define XVID_CSP_UYVY	3
@@ -66,13 +79,19 @@
 #define XVID_CSP_USER	12
 #define XVID_CSP_EXTERN      1004  // per slice rendering
 #define XVID_CSP_YVYU	1002
-#define XVID_CSP_RGB32 	1000
+#define XVID_CSP_RGB32 	1000	/* [b|g|r|a] */
+#define XVID_CSP_ABGR	1006	/* [a|b|g|r] */
+#define XVID_CSP_RGBA	1005	/* [r|g|b|a] */
+
+
+
 #define XVID_CSP_NULL 	9999
 
 #define XVID_CSP_VFLIP	0x80000000	// flip mask
 
 
 /*****************************************************************************
+ *  Initialization constants
  ****************************************************************************/
 
 /* CPU flags for XVID_INIT_PARAM.cpu_flags */
@@ -85,13 +104,19 @@
 #define XVID_CPU_3DNOWEXT	0x00000020
 
 #define XVID_CPU_TSC		0x00000040
+
 #define XVID_CPU_IA64		0x00000080
 
 #define XVID_CPU_CHKONLY	0x40000000		/* check cpu only; dont init globals */
 #define XVID_CPU_FORCE		0x80000000
 
 
+/*****************************************************************************
  *  Initialization structures
+ ****************************************************************************/
+
+	typedef struct
+	{
 		int cpu_flags;
 		int api_version;
 		int core_build;
@@ -148,6 +173,14 @@
 		int stride_y, stride_u,stride_v;
 	} XVID_DEC_PICTURE;
 
+
+/*****************************************************************************
+ * Decoder entry point
+ ****************************************************************************/
+
+/* decoder options */
+#define XVID_DEC_DECODE		0
+#define XVID_DEC_CREATE		1
 #define XVID_DEC_DESTROY	2
 
 	int xvid_decore(void *handle,
@@ -169,6 +202,12 @@
 #define XVID_VALID_FLAGS		0x80000000
 
 #define XVID_CUSTOM_QMATRIX		0x00000004	/* use custom quant matrix */
+#define XVID_H263QUANT			0x00000010
+#define XVID_MPEGQUANT			0x00000020
+#define XVID_HALFPEL			0x00000040	/* use halfpel interpolation */
+#define XVID_QUARTERPEL			0x02000000
+#define XVID_ADAPTIVEQUANT		0x00000080
+#define XVID_LUMIMASKING		0x00000100
 #define XVID_LATEINTRA			0x00000200
 
 #define XVID_INTERLACING		0x00000400	/* enable interlaced encoding */
@@ -188,13 +227,17 @@
 
 
 #define XVID_GREYSCALE			0x01000000	/* enable greyscale only mode (even for */
-#define XVID_GRAYSCALE			0x01000000      /* color input material chroma is ignored) */
+#define XVID_GRAYSCALE			0x01000000  /* color input material chroma is ignored) */
 
 
 /* Flags for XVID_ENC_FRAME.motion */
 #define PMV_ADVANCEDDIAMOND8	0x00004000
 #define PMV_ADVANCEDDIAMOND16   0x00008000
-#define PMV_EARLYSTOP16	   		0x00080000
+
+#define PMV_HALFPELDIAMOND16 	0x00010000
+#define PMV_HALFPELREFINE16 	0x00020000
+#define PMV_QUARTERPELREFINE16	0x00040000
+#define PMV_EXTSEARCH16 		0x00080000	/* extend PMV by more searches */
 #define PMV_QUICKSTOP16	   		0x00100000	/* like early, but without any more refinement */
 #define PMV_UNRESTRICTED16   	0x00200000	/* unrestricted ME, not implemented */
 #define PMV_OVERLAPPING16   	0x00400000	/* overlapping ME, not implemented */
@@ -202,8 +245,8 @@
 
 #define PMV_HALFPELDIAMOND8 	0x01000000
 #define PMV_HALFPELREFINE8 		0x02000000
-#define PMV_EXTSEARCH8 			0x04000000	/* extend PMV by more searches */
-#define PMV_EARLYSTOP8	   		0x08000000
+#define PMV_QUARTERPELREFINE8	0x04000000
+#define PMV_EXTSEARCH8 			0x08000000	/* extend PMV by more searches */
 #define PMV_QUICKSTOP8	   		0x10000000	/* like early, but without any more refinement */
 #define PMV_UNRESTRICTED8   	0x20000000	/* unrestricted ME, not implemented */
 #define PMV_OVERLAPPING8   		0x40000000	/* overlapping ME, not implemented */
@@ -234,13 +277,18 @@
 		int bquant_ratio;		/* bframe quantizer multipier (percentage).
 								 * used only when bquant < 1
 								 * eg. 200 = x2 multiplier
+								 * quant = ((past_quant + future_quant) * bquant_ratio)/200
+								 */
+		int frame_drop_ratio;   /* frame dropping: 0=drop none... 100=drop all */
 #endif
+		void *handle;			/* [out] encoder instance handle */
 	}
 	XVID_ENC_PARAM;
 
 	typedef struct
 	{
 		int x;
+		int y;
 	}
 	VECTOR;
 
@@ -298,7 +346,6 @@
 	typedef struct
 	{
 		int quant;				/* [out] frame quantizer */
-		int input_consumed;		/* [out] */
 		int hlength;			/* [out] header length (bytes) */
 		int kblks, mblks, ublks;	/* [out] */