--- branches/dev-api-4/xvidcore/src/xvid.h	2003/10/03 16:57:55	1169
+++ branches/dev-api-4/xvidcore/src/xvid.h	2003/11/29 17:26:12	1226
@@ -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.39 2003-10-03 16:57:55 edgomez Exp $
+ * $Id: xvid.h,v 1.27.2.44 2003-11-29 17:26:12 edgomez Exp $
  *
  ****************************************************************************/
 
@@ -57,7 +57,7 @@
 #define XVID_API_MAJOR(a)        (((a)>>16) & 0xff)
 #define XVID_API_MINOR(a)        (((a)>> 0) & 0xff)
 
-#define XVID_VERSION             XVID_MAKE_VERSION(1,-127,0)
+#define XVID_VERSION             XVID_MAKE_VERSION(1,0,-127)
 #define XVID_API                 XVID_MAKE_API(4, 0)
 
 #define XVID_UNSTABLE
@@ -73,7 +73,7 @@
  * doesnt hurt but not increasing it could cause difficulty for decoders in the
  * future
  */
-#define XVID_BS_VERSION "0020"
+#define XVID_BS_VERSION "0021"
 
 
 /*****************************************************************************
@@ -159,7 +159,7 @@
  * xvid_global()
  ****************************************************************************/
 
-/* cpu_flags definitions */
+/* cpu_flags definitions (make sure to sync this with cpuid.asm for ia32) */
 
 #define XVID_CPU_FORCE    (1<<31) /* force passed cpu flags */
 #define XVID_CPU_ASM      (1<< 7) /* native assembly */
@@ -217,7 +217,6 @@
 #define XVID_GBL_INIT    0 /* initialize xvidcore; must be called before using xvid_decore, or xvid_encore) */
 #define XVID_GBL_INFO    1 /* return some info about xvidcore, and the host computer */
 #define XVID_GBL_CONVERT 2 /* colorspace conversion utility */
-#define XVID_GBL_TEST    3 /* testing.. */
 
 int xvid_global(void *handle, int opt, void *param1, void *param2);
 
@@ -314,7 +313,8 @@
 #define XVID_PLG_DESTROY (1<<1)
 #define XVID_PLG_INFO    (1<<2)
 #define XVID_PLG_BEFORE  (1<<3)
-#define XVID_PLG_AFTER   (1<<4)
+#define XVID_PLG_FRAME   (1<<4)
+#define XVID_PLG_AFTER   (1<<5)
 
 /* xvid_plg_info_t.flags */
 #define XVID_REQORIGINAL (1<<0) /* plugin requires a copy of the original (uncompressed) image */
@@ -393,6 +393,8 @@
 	int sse_y;              /* [out] Y plane's sse */
 	int sse_u;              /* [out] U plane's sse */
 	int sse_v;              /* [out] V plane's sse */
+	int bquant_ratio;       /* [in] */
+	int bquant_offset;      /* [in] */
 } xvid_plg_data_t;
 
 
@@ -465,14 +467,12 @@
 	char * filename;              /* [in] first pass stats filename */
 
 	int keyframe_boost;           /* [in] keyframe boost percentage: [0..100] */
-	int payback_method;           /* [in] Payback method: see XVID_PAYBACK flags */
-	int bitrate_payback_delay;    /* [in] Payback delay expressed in number of frames */
 	int curve_compression_high;   /* [in] percentage of compression performed on the high part of the curve (above average) */
 	int curve_compression_low;    /* [in] percentage of compression performed on the low  part of the curve (below average) */
-	int max_overflow_improvement; /* [in] */
-	int max_overflow_degradation; /* [in] */
+	int overflow_control_strength;/* [in] Payback delay expressed in number of frames */
+	int max_overflow_improvement; /* [in] percentage of allowed range for a frame that gets bigger because of overflow bonus */
+	int max_overflow_degradation; /* [in] percentage of allowed range for a frame that gets smaller because of overflow penalty */
 
-	int kftreshold;               /* [in] */
 	int kfreduction;              /* [in] */
 	int min_key_interval;         /* [in] Minimum interval of frames between two IFrames */