--- xvid.h	2003/12/18 02:02:08	1.27.2.55
+++ xvid.h	2004/05/09 14:00:35	1.27.2.67
@@ -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.55 2003/12/18 02:02:08 Isibaar Exp $
+ * $Id: xvid.h,v 1.27.2.67 2004/05/09 14:00:35 chl 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,0,-126)
+#define XVID_VERSION             XVID_MAKE_VERSION(1,0,-124)
 #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 "0024"
+#define XVID_BS_VERSION "0030"
 
 
 /*****************************************************************************
@@ -96,7 +96,8 @@
 
 /* colorspace values */
 
-#define XVID_CSP_USER     (1<< 0) /* 4:2:0 planar (==I420, except for pointers/strides) */
+#define XVID_CSP_PLANAR   (1<< 0) /* 4:2:0 planar (==I420, except for pointers/strides) */
+#define XVID_CSP_USER	  XVID_CSP_PLANAR
 #define XVID_CSP_I420     (1<< 1) /* 4:2:0 planar */
 #define XVID_CSP_YV12     (1<< 2) /* 4:2:0 planar */
 #define XVID_CSP_YUY2     (1<< 3) /* 4:2:2 packed */
@@ -105,6 +106,7 @@
 #define XVID_CSP_BGRA     (1<< 6) /* 32-bit bgra packed */
 #define XVID_CSP_ABGR     (1<< 7) /* 32-bit abgr packed */
 #define XVID_CSP_RGBA     (1<< 8) /* 32-bit rgba packed */
+#define XVID_CSP_ARGB     (1<<15) /* 32-bit argb packed */
 #define XVID_CSP_BGR      (1<< 9) /* 24-bit bgr packed */
 #define XVID_CSP_RGB555   (1<<10) /* 16-bit rgb555 packed */
 #define XVID_CSP_RGB565   (1<<11) /* 16-bit rgb565 packed */
@@ -248,7 +250,7 @@
 #define XVID_DISCONTINUITY (1<<1) /* indicates break in stream */
 #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_FILMEFFECT    (1<<4) /* adds film grain */
 
 typedef struct {
 	int version;
@@ -516,6 +518,14 @@
 								   *      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 */
+
+#ifdef VBV
+  int vbvsize;
+  int vbvinitial;
+  int vbv_maxrate;
+  int vbv_peakrate;
+#endif
+
 }xvid_plugin_2pass2_t;
 
 /*****************************************************************************
@@ -644,10 +654,11 @@
 #define XVID_ME_EXTSEARCH8            (1<<11) /* use diamond/square for extended 8x8 search */
 #define XVID_ME_CHROMA_PVOP           (1<<12) /* also use chroma for P_VOP/S_VOP ME */
 #define XVID_ME_CHROMA_BVOP           (1<<13) /* also use chroma for B_VOP ME */
-#define XVID_ME_FASTREFINE16		  (1<<25) /* use low-complexity refinement functions */
+#define XVID_ME_FASTREFINE16          (1<<25) /* use low-complexity refinement functions */
+#define XVID_ME_FASTREFINE8           (1<<29) /* low-complexity 8x8 sub-block refinement */
 
 /* Rate Distortion based flags
- * Valid when XVID_VOP_MODEDECISION_BITS is enabled */
+ * Valid when XVID_VOP_MODEDECISION_RD is enabled */
 #define XVID_ME_HALFPELREFINE16_RD    (1<<14) /* perform RD-based halfpel refinement */
 #define XVID_ME_HALFPELREFINE8_RD     (1<<15) /* perform RD-based halfpel refinement for 8x8 mode */
 #define XVID_ME_QUARTERPELREFINE16_RD (1<<16) /* perform RD-based qpel refinement */
@@ -657,7 +668,9 @@
 
 /* Other */
 #define XVID_ME_DETECT_STATIC_MOTION  (1<<24) /* speed-up ME by detecting stationary scenes */
-#define XVID_ME_SKIP_DELTASEARCH	  (1<<26) /* speed-up by skipping b-frame delta search */
+#define XVID_ME_SKIP_DELTASEARCH      (1<<26) /* speed-up by skipping b-frame delta search */
+#define XVID_ME_FAST_MODEINTERPOLATE  (1<<27) /* speed-up by partly skipping interpolate mode */
+#define XVID_ME_BFRAME_EARLYSTOP      (1<<28) /* speed-up by early exiting b-search */
 
 /* Unused */
 #define XVID_ME_UNRESTRICTED16        (1<<20) /* unrestricted ME, not implemented */