--- branches/dev-api-4/xvidcore/src/xvid.h	2003/03/15 16:04:38	922
+++ branches/dev-api-4/xvidcore/src/xvid.h	2003/03/25 11:01:48	942
@@ -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.7 2003-03-15 16:04:38 suxen_drol Exp $
+ * $Id: xvid.h,v 1.27.2.11 2003-03-25 10:57:02 suxen_drol Exp $
  *
  ****************************************************************************/
 
@@ -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;
@@ -273,6 +273,7 @@
 /* xvid_plg_info_t.flags */
 #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
@@ -286,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;
@@ -297,8 +302,18 @@
 {
     int version;
 
+    int num_frames;          /* [out] totlal frame encoded */
+} xvid_plg_destroy_t;
+
+
+typedef struct
+{
+    int version;
+
     int width;              /* [out] */
     int height;             /* [out] */
+    int mb_width;           /* [out] */
+    int mb_height;          /* [out] */
 	int fincr;              /* [out] */
     int fbase;              /* [out] */
     
@@ -310,8 +325,8 @@
     int type;               /* [in,out] */
     int quant;              /* [in,out] */
 
-    unsigned char * qscale;	/* [in,out]	pointer to quantizer table */
-	int qscale_stride;		/* [in,out]	quantizer scale stride */
+    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] */
@@ -351,10 +366,82 @@
     void * param;
 } xvid_enc_plugin_t;
 
-xvid_plugin_func xvid_plugin_psnr;  /* stdout psnr calculator */
+
+
+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: first pass */
+xvid_plugin_func xvid_plugin_2pass2;   /* 2pass rate control: second pass */
+
+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;
+
+
+#define XVID_CURVE_COSINE   0   /* low aggressiveness */
+#define XVID_CURVE_LINEAR   1   /* medium aggressiveness */
+#define XVID_CURVE_SINE     2   /* high aggressiveness */
+
+#define XVID_PAYBACK_BIAS   0   /* payback with bias */
+#define XVID_PAYBACK_PROP   1   /* payback proportionally */
+
+typedef struct {
+    int version;
+    char * filename1;
+    char * filename2;
+
+    int keyframe_boost;             /* keyframe boost percentage: [0..100...]; */
+    int payback_method;
+    int bitrate_payback_delay;
+    int curve_compression_high;
+    int curve_compression_low;
+    int max_overflow_improvement;
+    int max_overflow_degradation;
+    int min_quant[3];
+    int max_quant[3];
+
+    int use_alt_curve;
+	int alt_curve_high_dist;
+	int alt_curve_low_dist;
+    int alt_curve_use_auto;
+	int alt_curve_auto_str;
+	int alt_curve_type; /* XVID_CURVE_ */
+	int alt_curve_min_rel_qual;
+	int alt_curve_use_auto_bonus_bias;
+    int alt_curve_bonus_bias;
+
+    int kftreshold;
+	int kfreduction;
+    int min_key_interval;
+}xvid_plugin_2pass2_t;
+
 
 /*****************************************************************************
  * xvid_encore()
@@ -398,7 +485,6 @@
 
     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
@@ -534,6 +620,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 */
 
@@ -541,7 +628,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) */