--- trunk/xvidcore/src/xvid.h	2004/04/15 19:44:06	1432
+++ trunk/xvidcore/src/xvid.h	2004/08/31 22:23:38	1546
@@ -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.37 2004-04-15 19:44:05 edgomez Exp $
+ * $Id: xvid.h,v 1.46 2004-08-31 22:23:38 edgomez Exp $
  *
  ****************************************************************************/
 
@@ -58,7 +58,7 @@
 #define XVID_API_MINOR(a)        (((a)>> 0) & 0xff)
 
 #define XVID_VERSION             XVID_MAKE_VERSION(1,1,-127)
-#define XVID_API                 XVID_MAKE_API(4, 0)
+#define XVID_API                 XVID_MAKE_API(4, 1)
 
 #define XVID_UNSTABLE
 
@@ -73,8 +73,7 @@
  * doesnt hurt but not increasing it could cause difficulty for decoders in the
  * future
  */
-#define XVID_BS_VERSION "0031"
-
+#define XVID_BS_VERSION 36
 
 /*****************************************************************************
  * error codes
@@ -251,6 +250,12 @@
 #define XVID_DEBLOCKY      (1<<2) /* perform luma deblocking */
 #define XVID_DEBLOCKUV     (1<<3) /* perform chroma deblocking */
 #define XVID_FILMEFFECT    (1<<4) /* adds film grain */
+#define XVID_DERINGUV      (1<<5) /* perform chroma deringing, requires deblocking to work */
+#define XVID_DERINGY       (1<<6) /* perform luma deringing, requires deblocking to work */
+
+#define XVID_DEC_FAST      (1<<29) /* disable postprocessing to decrease cpu usage *todo* */
+#define XVID_DEC_DROP      (1<<30) /* drop bframes to decrease cpu usage *todo* */
+#define XVID_DEC_PREROLL   (1<<31) /* decode as fast as you can, don't even show output *todo* */
 
 typedef struct {
 	int version;
@@ -258,7 +263,7 @@
 	void *bitstream;     /* [in]     bitstream (read from)*/
 	int length;          /* [in]     bitstream length */
 	xvid_image_t output; /* [in]     output image (written to) */
-/* ------- v1.1.0 ------- */
+/* ------- v1.1.x ------- */
 	int brightness;		 /* [in]	 brightness offset (0=none) */
 } xvid_dec_frame_t;
 
@@ -503,7 +508,7 @@
 typedef struct {
 	int version;
 
-	int bitrate;                  /* [in] bits per second */
+	int bitrate;                  /* [in] target bitrate (bits per second) */
 	char * filename;              /* [in] first pass stats filename */
 
 	int keyframe_boost;           /* [in] keyframe boost percentage: [0..100] */
@@ -520,6 +525,13 @@
 								   *      0 for 1<distance<kfthreshold */
 
 	int container_frame_overhead; /* [in] How many bytes the controller has to compensate per frame due to container format overhead */
+
+/* ------- v1.1.x ------- */
+	int vbv_size;                 /* [in] buffer size (bits) */
+	int vbv_initial;              /* [in] initial buffer occupancy (bits) */
+	int vbv_maxrate;              /* [in] max processing bitrate (bits per second) */
+	int vbv_peakrate;             /* [in:opt] max average bitrate over 3 seconds (bits per second) */
+
 }xvid_plugin_2pass2_t;
 
 /*****************************************************************************
@@ -616,6 +628,7 @@
 #define XVID_VOP_HQACPRED             (1<< 7) /* high quality ac prediction */
 #define XVID_VOP_MODEDECISION_RD      (1<< 8) /* enable DCT-ME and use it for mode decision */
 #define XVID_VOP_FAST_MODEDECISION_RD (1<<12) /* use simplified R-D mode decision */
+#define XVID_VOP_RD_BVOP              (1<<13) /* enable rate-distortion mode decision in b-frames */
 
 /* Only valid for vol_flags|=XVID_VOL_INTERLACING */
 #define XVID_VOP_TOPFIELDFIRST        (1<< 9) /* set top-field-first flag  */