--- motion_est.h	2003/02/21 14:40:11	1.3
+++ motion_est.h	2003/04/05 16:47:44	1.3.2.4
@@ -26,7 +26,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: motion_est.h,v 1.3 2003/02/21 14:40:11 syskin Exp $
+ *  $Id: motion_est.h,v 1.3.2.4 2003/04/05 16:47:44 edgomez Exp $
  *
  ***************************************************************************/
 
@@ -90,12 +90,14 @@
 	(int)(29.6436*NEIGH_TEND_8X8 + 0.5), (int)(36.4949*NEIGH_TEND_8X8 + 0.5)	};
 
 // mv.length table
-static const uint32_t mvtab[33] = {
-	1, 2, 3, 4, 6, 7, 7, 7,
-	9, 9, 9, 10, 10, 10, 10, 10,
-	10, 10, 10, 10, 10, 10, 10, 10,
-	10, 11, 11, 11, 11, 11, 11, 12, 12
-};
+static const int mvtab[64] = {
+		1, 2, 3, 4, 6, 7, 7, 7,
+		9, 9, 9, 10, 10, 10, 10, 10,
+		10, 10, 10, 10, 10, 10, 10, 10,
+		10, 11, 11, 11, 11, 11, 11, 12,
+		12, 12, 12, 12, 12, 12, 12, 12,
+		12, 12, 12, 12, 12, 12, 12, 12,
+		12, 12, 12, 12, 12, 12, 12, 12, 12 };
 
 static const int DQtab[4] = {
 	-1, -2, 1, 2
@@ -144,6 +146,8 @@
 	VECTOR directmvF[4];
 	VECTOR directmvB[4];
 	const VECTOR * referencemv;
+// _BITS stuff
+	int16_t * dctSpace;
 
 } SearchData;
 
@@ -246,38 +250,38 @@
 #define iDiamondSize 2
 
 static __inline uint32_t
-MakeGoodMotionFlags(const uint32_t MotionFlags, const uint32_t GlobalFlags)
+MakeGoodMotionFlags(const uint32_t MotionFlags, const uint32_t VopFlags, const uint32_t VolFlags)
 {
 	uint32_t Flags = MotionFlags;
 
-	if (!(GlobalFlags & XVID_MODEDECISION_BITS))
-		Flags &= ~(QUARTERPELREFINE16_BITS+QUARTERPELREFINE8_BITS+HALFPELREFINE16_BITS+HALFPELREFINE8_BITS+EXTSEARCH_BITS);
+	if (!(VopFlags & XVID_VOP_MODEDECISION_BITS))
+		Flags &= ~(XVID_ME_QUARTERPELREFINE16_BITS+XVID_ME_QUARTERPELREFINE8_BITS+XVID_ME_HALFPELREFINE16_BITS+XVID_ME_HALFPELREFINE8_BITS+XVID_ME_EXTSEARCH_BITS);
 
-	if (Flags & EXTSEARCH_BITS)
-		Flags |= HALFPELREFINE16_BITS;
+	if (Flags & XVID_ME_EXTSEARCH_BITS)
+		Flags |= XVID_ME_HALFPELREFINE16_BITS;
 	
-	if (Flags & EXTSEARCH_BITS && MotionFlags & PMV_EXTSEARCH8)
-		Flags |= HALFPELREFINE8_BITS;
+	if (Flags & XVID_ME_EXTSEARCH_BITS && MotionFlags & XVID_ME_EXTSEARCH8)
+		Flags |= XVID_ME_HALFPELREFINE8_BITS;
 
-	if (Flags & HALFPELREFINE16_BITS)
-		Flags |= QUARTERPELREFINE16_BITS;
+	if (Flags & XVID_ME_HALFPELREFINE16_BITS)
+		Flags |= XVID_ME_QUARTERPELREFINE16_BITS;
 
-	if (Flags & HALFPELREFINE8_BITS) {
-		Flags |= QUARTERPELREFINE8_BITS;
-		Flags &= ~PMV_HALFPELREFINE8;
+	if (Flags & XVID_ME_HALFPELREFINE8_BITS) {
+		Flags |= XVID_ME_QUARTERPELREFINE8_BITS;
+		Flags &= ~XVID_ME_HALFPELREFINE8;
 	}
 
-	if (Flags & QUARTERPELREFINE8_BITS)
-		Flags &= ~PMV_QUARTERPELREFINE8;
+	if (Flags & XVID_ME_QUARTERPELREFINE8_BITS)
+		Flags &= ~XVID_ME_QUARTERPELREFINE8;
 
-	if (!(GlobalFlags & XVID_QUARTERPEL))
-		Flags &= ~(PMV_QUARTERPELREFINE16+PMV_QUARTERPELREFINE8+QUARTERPELREFINE16_BITS+QUARTERPELREFINE8_BITS);
+	if (!(VolFlags & XVID_VOL_QUARTERPEL))
+		Flags &= ~(XVID_ME_QUARTERPELREFINE16+XVID_ME_QUARTERPELREFINE8+XVID_ME_QUARTERPELREFINE16_BITS+XVID_ME_QUARTERPELREFINE8_BITS);
 
-	if (!(GlobalFlags & XVID_HALFPEL))
-		Flags &= ~(PMV_EXTSEARCH16+PMV_HALFPELREFINE16+PMV_HALFPELREFINE8+HALFPELREFINE16_BITS+HALFPELREFINE8_BITS);
+	if (!(VopFlags & XVID_VOP_HALFPEL))
+		Flags &= ~(XVID_ME_EXTSEARCH16+XVID_ME_HALFPELREFINE16+XVID_ME_HALFPELREFINE8+XVID_ME_HALFPELREFINE16_BITS+XVID_ME_HALFPELREFINE8_BITS);
 
-	if (GlobalFlags & (XVID_GREYSCALE + XVID_REDUCED))
-		Flags &= ~(PMV_CHROMA16 + PMV_CHROMA8);
+	if ((VopFlags & XVID_VOP_GREYSCALE) || (VopFlags & XVID_VOP_REDUCED))
+		Flags &= ~(XVID_ME_CHROMA16 + XVID_ME_CHROMA8);
 
 	return Flags;
 }