--- trunk/xvidcore/src/xvid.h	2002/06/20 14:05:58	229
+++ branches/dev-api-3/xvidcore/src/xvid.h	2002/10/05 21:37:44	579
@@ -28,7 +28,7 @@
 *               ToDo ? : when BFRAMES is defined, the API_VERSION should not
 *                        be the same (3.0 ?)
 *
-*  $Id: xvid.h,v 1.12 2002-06-20 14:05:57 suxen_drol Exp $
+*  $Id: xvid.h,v 1.17.2.1 2002-10-05 21:34:04 Isibaar Exp $
 *
 *****************************************************************************/
 
@@ -37,7 +37,7 @@
 #define _XVID_H_
 
 #ifdef __cplusplus
-*  $Id: xvid.h,v 1.12 2002-06-20 14:05:57 suxen_drol Exp $
+extern "C" {
 #endif
 
 /*****************************************************************************
@@ -73,6 +73,7 @@
 
 
 /*****************************************************************************
+ *  Initialization constants
  ****************************************************************************/
 
 /* CPU flags for XVID_INIT_PARAM.cpu_flags */
@@ -97,6 +98,7 @@
  ****************************************************************************/
 
 	typedef struct
+	{
 		int cpu_flags;
 		int api_version;
 		int core_build;
@@ -153,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,
@@ -174,6 +184,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 */
@@ -193,13 +209,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 */
@@ -207,8 +227,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 */
@@ -239,14 +259,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
-		int packed;				/* enable packed mode */
+		void *handle;			/* [out] encoder instance handle */
 	}
 	XVID_ENC_PARAM;
 
 	typedef struct
 	{
 		int x;
+		int y;
 	}
 	VECTOR;