--- xvid.h	2002/11/02 15:52:30	1.17.2.6
+++ xvid.h	2002/12/14 06:07:03	1.17.2.15
@@ -28,7 +28,7 @@
 *               ToDo ? : when BFRAMES is defined, the API_VERSION should not
 *                        be the same (3.0 ?)
 *
-*  $Id: xvid.h,v 1.17.2.6 2002/11/02 15:52:30 chl Exp $
+*  $Id: xvid.h,v 1.17.2.15 2002/12/14 06:07:03 suxen_drol Exp $
 *
 *****************************************************************************/
 
@@ -110,6 +110,18 @@
 #define XVID_CPU_CHKONLY	0x40000000		/* check cpu only; dont init globals */
 #define XVID_CPU_FORCE		0x80000000
 
+	typedef struct
+	{
+		int colorspace;
+		void * y;
+		void * u;
+		void * v;
+		int y_stride;
+		int uv_stride;
+	} XVID_IMAGE;		/* from yv12 */
+
+#define XVID_INIT_INIT		0
+#define XVID_INIT_CONVERT	1
 
 /*****************************************************************************
  *  Initialization structures
@@ -123,6 +135,15 @@
 	}
 	XVID_INIT_PARAM;
 
+	typedef struct
+	{
+		XVID_IMAGE input;
+		XVID_IMAGE output;
+		int width;
+		int height;
+		int interlacing;
+	} XVID_INIT_CONVERTINFO;
+
 /*****************************************************************************
  *  Initialization entry point
  ****************************************************************************/
@@ -138,6 +159,9 @@
  ****************************************************************************/
 
 /* Flags for XVID_DEC_FRAME.general */
+#define XVID_DEC_LOWDELAY		0x00000001	/* decode lowdelay mode (ie. video-for-windows) */
+#define XVID_DEC_DEBLOCKY		0x00000002	/* luma deblocking */
+#define XVID_DEC_DEBLOCKUV		0x00000002	/* chroma deblocking */
 #define XVID_QUICK_DECODE		0x00000010
 
 /*****************************************************************************
@@ -153,6 +177,33 @@
 	XVID_DEC_PARAM;
 
 
+#define XVID_DEC_VOP	0
+#define XVID_DEC_VOL	1
+#define XVID_DEC_NOTHING	2	/* nothing was decoded */
+
+	typedef struct
+	{
+		int notify;			/* [out]	output 'mode' */
+		union
+		{
+			struct	/* XVID_DEC_VOP */
+			{
+				int time_base;		/* [out]	time base */
+				int time_increment;	/* [out]	time increment */
+			} vop;
+			struct	/* XVID_DEC_VOL */
+			{
+				int general;		/* [out]	flags: eg. frames are interlaced */
+				int width;			/* [out]	width */
+				int height;			/* [out]	height */
+				int aspect_ratio;	/* [out]	aspect ratio */
+				int par_width;		/* [out]	aspect ratio width */
+				int par_height;		/* [out]	aspect ratio height */
+			} vol;
+		} data;
+	} XVID_DEC_STATS;
+
+
 	typedef struct
 	{
 		int general;
@@ -197,6 +248,7 @@
 #define XVID_GLOBAL_PACKED		0x00000001	/* packed bitstream */
 #define XVID_GLOBAL_DX50BVOP	0x00000002	/* dx50 bvop compatibility */
 #define XVID_GLOBAL_DEBUG		0x00000004	/* print debug info on each frame */
+#define XVID_GLOBAL_REDUCED		0x04000000	/* reduced resolution vop enable */
 
 /* Flags for XVID_ENC_FRAME.general */
 #define XVID_VALID_FLAGS		0x80000000
@@ -225,11 +277,13 @@
 #define XVID_ME_PMVFAST			0x00080000
 #define XVID_ME_EPZS			0x00100000
 
-
 #define XVID_GREYSCALE			0x01000000	/* enable greyscale only mode (even for */
 #define XVID_GRAYSCALE			0x01000000  /* color input material chroma is ignored) */
 
-#define XVID_GMC			0x20000000
+#define XVID_GMC				0x20000000
+#define XVID_ME_COLOUR			0x40000000
+
+#define XVID_REDUCED			0x04000000	/* reduced resolution vop */
 
 /* Flags for XVID_ENC_FRAME.motion */
 #define PMV_ADVANCEDDIAMOND8	0x00004000
@@ -254,6 +308,7 @@
 #define PMV_USESQUARES8			0x80000000
 
 
+
 /*****************************************************************************
  * Encoder structures
  ****************************************************************************/
@@ -272,7 +327,6 @@
 #ifdef _SMP
 		int num_threads;		/* number of threads */
 #endif
-#ifdef BFRAMES
 		int global;				/* global/debug options */
 		int max_bframes;		/* max sequential bframes (0=disable bframes) */
 		int bquant_ratio;		/* bframe quantizer multipier (percentage).
@@ -280,8 +334,8 @@
 								 * eg. 200 = x2 multiplier
 								 * quant = ((past_quant + future_quant) * bquant_ratio)/200
 								 */
+		int bquant_offset;		/* bquant += bquant_offset */
 		int frame_drop_ratio;   /* frame dropping: 0=drop none... 100=drop all */
-#endif
 		void *handle;			/* [out] encoder instance handle */
 	}
 	XVID_ENC_PARAM;
@@ -326,6 +380,7 @@
 		int length;				/* [out] bitstream length (bytes) */
 
 		void *image;			/* [in] image ptr */
+		int stride;
 		int colorspace;			/* [in] source colorspace */
 
 		unsigned char *quant_intra_matrix;	// [in] custom intra qmatrix */
@@ -336,9 +391,7 @@
 								 */
 		HINTINFO hint;			/* [in/out] mv hint information */
 
-#ifdef BFRAMES
 		int bquant;				/* [in] bframe quantizer */
-#endif
 
 	}
 	XVID_ENC_FRAME;
@@ -349,7 +402,6 @@
 		int quant;				/* [out] frame quantizer */
 		int hlength;			/* [out] header length (bytes) */
 		int kblks, mblks, ublks;	/* [out] */
-
 	}
 	XVID_ENC_STATS;