--- xvid.h	2003/08/02 15:08:35	1.27.2.30
+++ xvid.h	2003/09/28 13:43:47	1.27.2.37
@@ -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.30 2003/08/02 15:08:35 edgomez Exp $
+ * $Id: xvid.h,v 1.27.2.37 2003/09/28 13:43:47 edgomez Exp $
  *
  ****************************************************************************/
 
@@ -49,9 +49,9 @@
 	*/
 
 #define XVID_MAKE_VERSION(a,b,c) ((((a)&0xff)<<16) | (((b)&0xff)<<8) | ((c)&0xff))
-#define XVID_VERSION_MAJOR(a)    (((a)>>16) & 0xff)
-#define XVID_VERSION_MINOR(a)    (((a)>> 8) & 0xff)
-#define XVID_VERSION_PATCH(a)    (((a)>> 0) & 0xff)
+#define XVID_VERSION_MAJOR(a)    ((char)(((a)>>16) & 0xff))
+#define XVID_VERSION_MINOR(a)    ((char)(((a)>> 8) & 0xff))
+#define XVID_VERSION_PATCH(a)    ((char)(((a)>> 0) & 0xff))
 
 #define XVID_MAKE_API(a,b)       ((((a)&0xff)<<16) | (((b)&0xff)<<0))
 #define XVID_API_MAJOR(a)        (((a)>>16) & 0xff)
@@ -73,7 +73,7 @@
  * doesnt hurt but not increasing it could cause difficulty for decoders in the
  * future
  */
-#define XVID_BS_VERSION "0016"
+#define XVID_BS_VERSION "0019"
 
 
 /*****************************************************************************
@@ -138,7 +138,7 @@
 #define XVID_PROFILE_AS_L4   0xf4
 
 /* aspect ratios */
-#define XVID_PAR_11_VGA    1 /* 1:1 vga (square) */
+#define XVID_PAR_11_VGA    1 /* 1:1 vga (square), default if AR is not precised (ie: ==0) */
 #define XVID_PAR_43_PAL    2 /* 4:3 pal (12:11 625-line) */
 #define XVID_PAR_43_NTSC   3 /* 4:3 ntsc (10:11 525-line) */
 #define XVID_PAR_169_PAL   4 /* 16:9 pal (16:11 625-line) */
@@ -188,7 +188,7 @@
 /* XVID_GBL_INIT param1 */
 typedef struct {
 	int version;
-	int cpu_flags; /* [in:opt] zero = autodetect cpu; XVID_CPU_FORCE|{cpu features} = force cpu features */
+	unsigned int cpu_flags; /* [in:opt] zero = autodetect cpu; XVID_CPU_FORCE|{cpu features} = force cpu features */
 	int debug;     /* [in:opt] debug level */
 } xvid_gbl_init_t;
 
@@ -198,7 +198,7 @@
 	int version;
 	int actual_version; /* [out] returns the actual xvidcore version */
 	const char * build; /* [out] if !null, points to description of this xvid core build */
-	int cpu_flags;      /* [out] detected cpu features */
+	unsigned int cpu_flags;      /* [out] detected cpu features */
 	int num_threads;    /* [out] detected number of cpus/threads */
 } xvid_gbl_info_t;
 
@@ -531,6 +531,7 @@
 /* only valid for vol_flags|=XVID_VOL_REDUCED_ENABLED */
 #define XVID_VOP_REDUCED         (1<<11) /* reduced resolution vop */
 
+#define XVID_VOP_FAST_MODEDECISION_RD (1<< 12) /* use simplified R-D mode decision */
 
 
 
@@ -550,11 +551,11 @@
 #define XVID_ME_CHROMA_BVOP           (1<<13) /* also use chroma for B_VOP ME */
 
 /* Motion search using DCT. use XVID_VOP_MODEDECISION_BITS to enable */
-#define XVID_ME_HALFPELREFINE16_RD    (1<<14) /* perform DCT-based halfpel refinement */
-#define XVID_ME_HALFPELREFINE8_RD     (1<<15) /* perform DCT-based halfpel refinement for 8x8 mode */
-#define XVID_ME_QUARTERPELREFINE16_RD (1<<16) /* perform DCT-based qpel refinement */
-#define XVID_ME_QUARTERPELREFINE8_RD  (1<<17) /* perform DCT-based qpel refinement for 8x8 mode */
-#define XVID_ME_EXTSEARCH_RD          (1<<18) /* perform DCT-based search using square pattern enable XVID_ME_EXTSEARCH8 to do this in 8x8 search as well */
+#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 */
+#define XVID_ME_QUARTERPELREFINE8_RD  (1<<17) /* perform RD-based qpel refinement for 8x8 mode */
+#define XVID_ME_EXTSEARCH_RD          (1<<18) /* perform RD-based search using square pattern enable XVID_ME_EXTSEARCH8 to do this in 8x8 search as well */
 #define XVID_ME_CHECKPREDICTION_RD    (1<<19) /* always check vector equal to prediction */
 
 #define XVID_ME_UNRESTRICTED16        (1<<20) /* unrestricted ME, not implemented */
@@ -562,7 +563,8 @@
 #define XVID_ME_UNRESTRICTED8         (1<<22) /* unrestricted ME, not implemented */
 #define XVID_ME_OVERLAPPING8          (1<<23) /* overlapping ME, not implemented */
 
-
+#define XVID_ME_DETECT_STATIC_MOTION  (1<<24) /* speed-up ME by detecting stationary scenes */
+#define XVID_ME_FASTREFINE16		  (1<<25) /* use low-complexity refinement functions */
 
 /* XVID_ENC_CREATE param1 */
 typedef struct {