--- xvid.h	2002/12/30 10:49:17	1.17.2.18
+++ xvid.h	2003/01/13 14:33:24	1.17.2.23
@@ -28,7 +28,7 @@
 *               ToDo ? : when BFRAMES is defined, the API_VERSION should not
 *                        be the same (3.0 ?)
 *
-*  $Id: xvid.h,v 1.17.2.18 2002/12/30 10:49:17 suxen_drol Exp $
+*  $Id: xvid.h,v 1.17.2.23 2003/01/13 14:33:24 chl Exp $
 *
 *****************************************************************************/
 
@@ -59,7 +59,7 @@
  * doesnt hurt but not increasing it could cause difficulty for decoders in the
  * future
  */
-#define XVID_BS_VERSION "0003"
+#define XVID_BS_VERSION "0007"
 
 
 /* Error codes */
@@ -96,20 +96,23 @@
  ****************************************************************************/
 
 /* CPU flags for XVID_INIT_PARAM.cpu_flags */
+#define XVID_CPU_FORCE		0x80000000
+#define XVID_CPU_CHKONLY	0x40000000		/* check cpu only; dont init globals */
 
-#define XVID_CPU_MMX		0x00000001
-#define XVID_CPU_MMXEXT		0x00000002
-#define XVID_CPU_SSE		0x00000004 
-#define XVID_CPU_SSE2		0x00000008
-#define XVID_CPU_3DNOW		0x00000010
-#define XVID_CPU_3DNOWEXT	0x00000020
-
-#define XVID_CPU_TSC		0x00000040
-
-#define XVID_CPU_IA64		0x00000080
+#define XVID_CPU_ASM		0x00000080		/* native assembly */
+/* ARCH_X86 */
+#define XVID_CPU_MMX		0x00000001		/* mmx: pentiumMMX,k6 */
+#define XVID_CPU_MMXEXT		0x00000002		/* mmxx-ext: pentium2,athlon */
+#define XVID_CPU_SSE		0x00000004		/* sse: pentium3,athlonXP */
+#define XVID_CPU_SSE2		0x00000008		/* sse2: pentium4,athlon64 */
+#define XVID_CPU_3DNOW		0x00000010		/* 3dnow: k6-2 */
+#define XVID_CPU_3DNOWEXT	0x00000020		/* 3dnow-ext: athlon */
+#define XVID_CPU_TSC		0x00000040		/* timestamp counter */
+/* ARCH_IA64 */
+#define XVID_CPU_IA64		XVID_CPU_ASM	/* defined for backward compatibility */
+/* ARCH_PPC */
+#define XVID_CPU_ALTIVEC	0x00000001		/* altivec */
 
-#define XVID_CPU_CHKONLY	0x40000000		/* check cpu only; dont init globals */
-#define XVID_CPU_FORCE		0x80000000
 
 	typedef struct
 	{
@@ -284,8 +287,8 @@
 #define XVID_GREYSCALE			0x01000000	/* enable greyscale only mode (even for */
 #define XVID_GRAYSCALE			0x01000000  /* color input material chroma is ignored) */
 
-#define XVID_GMC				0x20000000
-#define XVID_ME_COLOUR			0x40000000
+#define XVID_GMC				0x10000000
+#define XVID_GMC_TRANSLATIONAL	0x20000000
 
 #define XVID_REDUCED			0x04000000	/* reduced resolution vop */
 
@@ -297,21 +300,34 @@
 #define PMV_HALFPELREFINE16 	0x00020000
 #define PMV_QUARTERPELREFINE16	0x00040000
 #define PMV_EXTSEARCH16 		0x00080000	/* extend PMV by more searches */
-#define PMV_QUICKSTOP16	   		0x00100000	/* like early, but without any more refinement */
+
+#define PMV_CHROMA16			0x00100000	/* also use chroma for MB-ME */
 #define PMV_UNRESTRICTED16   	0x00200000	/* unrestricted ME, not implemented */
 #define PMV_OVERLAPPING16   	0x00400000	/* overlapping ME, not implemented */
-#define PMV_USESQUARES16		0x00800000
+#define PMV_USESQUARES16		0x00800000	/* use squares instead of diamonds as search pattern */
 
 #define PMV_HALFPELDIAMOND8 	0x01000000
 #define PMV_HALFPELREFINE8 		0x02000000
 #define PMV_QUARTERPELREFINE8	0x04000000
 #define PMV_EXTSEARCH8 			0x08000000	/* extend PMV by more searches */
-#define PMV_QUICKSTOP8	   		0x10000000	/* like early, but without any more refinement */
+
+#define PMV_CHROMA8				0x10000000	/* also use chroma for B-ME */
 #define PMV_UNRESTRICTED8   	0x20000000	/* unrestricted ME, not implemented */
 #define PMV_OVERLAPPING8   		0x40000000	/* overlapping ME, not implemented */
 #define PMV_USESQUARES8			0x80000000
 
 
+/* note: old and deprecated */
+
+/* only for compatability with old encoders */
+
+#define PMV_EARLYSTOP16			0x00	
+#define PMV_EARLYSTOP8			0x00
+#define PMV_QUICKSTOP16	   		0x00	
+#define PMV_QUICKSTOP8	   		0x00	
+
+#define XVID_ME_COLOUR			0x00	/* this has been converted to PMV_COLOUR[16/8] */
+
 
 /*****************************************************************************
  * Encoder structures