--- xvid.h	2003/03/13 11:07:20	1.27.2.5
+++ xvid.h	2003/03/23 04:01:49	1.27.2.10
@@ -19,7 +19,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  *
- * $Id: xvid.h,v 1.27.2.5 2003/03/13 11:07:20 suxen_drol Exp $
+ * $Id: xvid.h,v 1.27.2.10 2003/03/23 04:01:49 suxen_drol Exp $
  *
  ****************************************************************************/
 
@@ -177,8 +177,8 @@
 	int version;
 	xvid_image_t input;	/* [in]	input image & colorspace */
 	xvid_image_t output;	/* [in]	output image & colorspace */
-	int width;				/* [in] width */
-	int height;				/* [in] height */
+ 	int width;				/* [in] width */
+ 	int height;				/* [in] height */
 	int interlacing;		/* [in] interlacing */
 } xvid_gbl_convert_t;
 
@@ -239,7 +239,7 @@
 			int time_increment;	/* [out]	time increment */
 
 			/* XXX: external deblocking stuff */
-			unsigned char * qscale;	/* [out]	pointer to quantizer table */
+			int * qscale;	/* [out]	pointer to quantizer table */
 			int qscale_stride;		/* [out]	quantizer scale stride */
 
 		} vop;
@@ -271,7 +271,9 @@
 #define XVID_PLG_AFTER      4
 
 /* xvid_plg_info_t.flags */
-#define XVID_PLG_ORIGINAL   1  /* plugin requires a copy of the original (uncompressed) image */
+#define XVID_REQORIGINAL    1  /* plugin requires a copy of the original (uncompressed) image */
+#define XVID_REQPSNR        2  /* plugin requires psnr between the uncompressed and compressed image*/
+#define XVID_REQDQUANTS      3  /* plugin requires access to the dquant table */
 
 
 typedef struct
@@ -285,8 +287,12 @@
 {
     int version;
 
-    int width, height;
-	int fincr, fbase;
+    int width;
+    int height;
+    int mb_width;
+    int mb_height;
+	int fincr;
+    int fbase;
 
     void * param;
 } xvid_plg_create_t;
@@ -295,16 +301,32 @@
 typedef struct
 {
     int version;
-   
-    xvid_image_t reference;
-    xvid_image_t current;
-    xvid_image_t original;	    /* after: points the original (uncompressed) copy of the current frame */
 
-    int type;                   /* [in,out] */
-    int quant;                  /* [in,out] */
+    int num_frames;          /* [out] totlal frame encoded */
+} xvid_plg_destroy_t;
 
-    unsigned char * qscale;	/* [in,out]	pointer to quantizer table */
-	int qscale_stride;		/* [in,out]	quantizer scale stride */
+
+typedef struct
+{
+    int version;
+
+    int width;              /* [out] */
+    int height;             /* [out] */
+    int mb_width;           /* [out] */
+    int mb_height;          /* [out] */
+	int fincr;              /* [out] */
+    int fbase;              /* [out] */
+    
+    xvid_image_t reference; /* [out] -> [out] */
+    xvid_image_t current;   /* [out] -> [in,out] */
+    xvid_image_t original;	/* [out] after: points the original (uncompressed) copy of the current frame */
+    int frame_num;          /* [out] frame number */
+
+    int type;               /* [in,out] */
+    int quant;              /* [in,out] */
+
+    int * dquant;	        /* [in,out]	pointer to diff quantizer table */
+	int dquant_stride;		/* [in,out]	diff quantizer stride */
 
     int vop_flags;          /* [in,out] */
     int vol_flags;          /* [in,out] */
@@ -312,6 +334,7 @@
 
     int length;                 /* [out] after: length of encoded frame */
     int kblks, mblks, ublks;	/* [out] after: */
+    int sse_y, sse_u, sse_v;    /* [out] */
 } xvid_plg_data_t;
 
 
@@ -345,6 +368,44 @@
 
 
 
+xvid_plugin_func xvid_plugin_fixed;   /* fixed quantizer control */
+xvid_plugin_func xvid_plugin_cbr;   /* constant bitrate control */
+xvid_plugin_func xvid_plugin_2pass1;   /* 2pass rate control: pass 1 */
+
+xvid_plugin_func xvid_plugin_lumimasking;  /* lumimasking */
+
+xvid_plugin_func xvid_plugin_psnr;  /* write psnr values to stdout */
+xvid_plugin_func xvid_plugin_dump;  /* dump before and after yuvpgms */
+
+
+typedef struct
+{
+    int version;
+    int quant_increment;
+    int quant_base;
+} xvid_plugin_fixed_t;
+
+
+typedef struct
+{
+    int version;
+    int bitrate;
+    int max_quantizer;
+    int min_quantizer;
+    int reaction_delay_factor;
+    int averaging_period;
+    int buffer;
+} xvid_plugin_cbr_t;
+
+
+typedef struct {
+    int version;
+    char * filename;
+} xvid_plugin_2pass1_t;
+
+
+
+
 /*****************************************************************************
  * xvid_encore()
  ****************************************************************************/
@@ -373,6 +434,7 @@
 /* vol-based flags */
 typedef enum {
     XVID_MPEGQUANT          = 0x00000001,
+    XVID_EXTRASTATS         = 0x00000002,
     XVID_QUARTERPEL	        = 0x00000004,	/* enable quarterpel: frames will encoded as quarterpel */
     XVID_GMC			    = 0x00000008,	/* enable GMC; frames will be checked for gmc suitability */
     XVID_REDUCED_ENABLE	    = 0x00000010,	/* enable reduced resolution vops: frames will be checked for rrv suitability */
@@ -383,10 +445,9 @@
 /* vop-based flags */
 typedef enum {
     XVID_DEBUG              = 0x00000001,
-    XVID_EXTRASTATS         = 0x00000002,
+
     XVID_HALFPEL            = 0x00000004, /* use halfpel interpolation */
     XVID_INTER4V            = 0x00000008,
-    XVID_LUMIMASKING        = 0x00000010,
     
     XVID_CHROMAOPT          = 0x00000020, /* enable chroma optimization pre-filter */
     XVID_GREYSCALE          = 0x00000040, /* enable greyscale only mode (even for
@@ -522,6 +583,7 @@
 	int par_height;			/* [in:opt] aspect ratio height */
 /* ^^^----------------------------------------------------------------------------------*/
 
+    int fincr;				/* framerate increment, for variable framerate only */
 	xvid_vop_t vop_flags;			/* [in] (general)vop-based flags */
 	xvid_motion_t motion;				/* [in] ME options */
 
@@ -529,7 +591,6 @@
 	
 	int type;				/* [in:opt] coding type */
 	int quant;				/* [in] frame quantizer; if <=0, automatatic (ratecontrol) */
-	int bquant;				/* [in:opt] bframe quantizer; if <=0, automatic*/
 
 	void *bitstream;		/* [in:opt] bitstream ptr (written to)*/
 	int length;				/* [in:opt] bitstream length (bytes) */