--- trunk/xvidcore/src/xvid.h	2002/06/13 12:42:18	199
+++ trunk/xvidcore/src/xvid.h	2002/07/31 18:10:34	352
@@ -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 2002-07-31 18:10:34 chl 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
 
 /*****************************************************************************
@@ -73,6 +73,7 @@
 
 
 /*****************************************************************************
+ *  Initialization constants
  ****************************************************************************/
 
 /* CPU flags for XVID_INIT_PARAM.cpu_flags */
@@ -85,13 +86,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 +155,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 +184,11 @@
 #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_ADAPTIVEQUANT		0x00000080
+#define XVID_LUMIMASKING		0x00000100
 #define XVID_LATEINTRA			0x00000200
 
 #define XVID_INTERLACING		0x00000400	/* enable interlaced encoding */
@@ -194,6 +214,10 @@
 /* Flags for XVID_ENC_FRAME.motion */
 #define PMV_ADVANCEDDIAMOND8	0x00004000
 #define PMV_ADVANCEDDIAMOND16   0x00008000
+
+#define PMV_HALFPELDIAMOND16 	0x00010000
+#define PMV_HALFPELREFINE16 	0x00020000
+#define PMV_EXTSEARCH16 		0x00040000	/* extend PMV by more searches */
 #define PMV_EARLYSTOP16	   		0x00080000
 #define PMV_QUICKSTOP16	   		0x00100000	/* like early, but without any more refinement */
 #define PMV_UNRESTRICTED16   	0x00200000	/* unrestricted ME, not implemented */
@@ -234,13 +258,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 +327,6 @@
 	typedef struct
 	{
 		int quant;				/* [out] frame quantizer */
-		int input_consumed;		/* [out] */
 		int hlength;			/* [out] header length (bytes) */
 		int kblks, mblks, ublks;	/* [out] */