--- trunk/xvidcore/src/xvid.h	2002/06/23 03:58:32	234
+++ 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.13 2002-06-23 03:58:32 suxen_drol 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.13 2002-06-23 03:58:32 suxen_drol Exp $
+extern "C" {
 #endif
 
 /*****************************************************************************
@@ -73,6 +73,7 @@
 
 
 /*****************************************************************************
+ *  Initialization constants
  ****************************************************************************/
 
 /* CPU flags for XVID_INIT_PARAM.cpu_flags */
@@ -154,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,
@@ -205,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 */
@@ -245,6 +258,9 @@
 		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 */
 	}
@@ -253,6 +269,7 @@
 	typedef struct
 	{
 		int x;
+		int y;
 	}
 	VECTOR;