--- motion_est.h	2003/04/05 16:47:44	1.3.2.4
+++ motion_est.h	2003/04/08 11:12:07	1.6
@@ -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.2.4 2003/04/05 16:47:44 edgomez Exp $
+ *  $Id: motion_est.h,v 1.6 2003/04/08 11:12:07 syskin Exp $
  *
  ***************************************************************************/
 
@@ -114,12 +114,7 @@
 	VECTOR * currentMV;
 	VECTOR * currentQMV;
 	int32_t * iMinSAD;
-	const uint8_t * Ref;
-	const uint8_t * RefH;
-	const uint8_t * RefV;
-	const uint8_t * RefHV;
-	const uint8_t * RefCU;
-	const uint8_t * RefCV;
+	const uint8_t * RefP[6]; // N, V, H, HV, cU, cV
 	const uint8_t * CurU;
 	const uint8_t * CurV;
 	uint8_t * RefQ;
@@ -133,13 +128,7 @@
 	int chroma;
 	int rrv;
 //fields for interpolate and direct modes
-	const uint8_t * bRef;
-	const uint8_t * bRefH;
-	const uint8_t * bRefV;
-	const uint8_t * bRefHV;
-	const uint8_t * b_RefCU;
-	const uint8_t * b_RefCV;
-
+	const uint8_t * b_RefP[6]; // N, V, H, HV, cU, cV
 	VECTOR bpredMV;
 	uint32_t bFcode;
 // fields for direct mode
@@ -250,38 +239,38 @@
 #define iDiamondSize 2
 
 static __inline uint32_t
-MakeGoodMotionFlags(const uint32_t MotionFlags, const uint32_t VopFlags, const uint32_t VolFlags)
+MakeGoodMotionFlags(const uint32_t MotionFlags, const uint32_t GlobalFlags)
 {
 	uint32_t Flags = MotionFlags;
 
-	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 (!(GlobalFlags & XVID_MODEDECISION_BITS))
+		Flags &= ~(QUARTERPELREFINE16_BITS+QUARTERPELREFINE8_BITS+HALFPELREFINE16_BITS+HALFPELREFINE8_BITS+EXTSEARCH_BITS);
 
-	if (Flags & XVID_ME_EXTSEARCH_BITS)
-		Flags |= XVID_ME_HALFPELREFINE16_BITS;
+	if (Flags & EXTSEARCH_BITS)
+		Flags |= HALFPELREFINE16_BITS;
 	
-	if (Flags & XVID_ME_EXTSEARCH_BITS && MotionFlags & XVID_ME_EXTSEARCH8)
-		Flags |= XVID_ME_HALFPELREFINE8_BITS;
+	if (Flags & EXTSEARCH_BITS && MotionFlags & PMV_EXTSEARCH8)
+		Flags |= HALFPELREFINE8_BITS;
 
-	if (Flags & XVID_ME_HALFPELREFINE16_BITS)
-		Flags |= XVID_ME_QUARTERPELREFINE16_BITS;
+	if (Flags & HALFPELREFINE16_BITS)
+		Flags |= QUARTERPELREFINE16_BITS;
 
-	if (Flags & XVID_ME_HALFPELREFINE8_BITS) {
-		Flags |= XVID_ME_QUARTERPELREFINE8_BITS;
-		Flags &= ~XVID_ME_HALFPELREFINE8;
+	if (Flags & HALFPELREFINE8_BITS) {
+		Flags |= QUARTERPELREFINE8_BITS;
+		Flags &= ~PMV_HALFPELREFINE8;
 	}
 
-	if (Flags & XVID_ME_QUARTERPELREFINE8_BITS)
-		Flags &= ~XVID_ME_QUARTERPELREFINE8;
+	if (Flags & QUARTERPELREFINE8_BITS)
+		Flags &= ~PMV_QUARTERPELREFINE8;
 
-	if (!(VolFlags & XVID_VOL_QUARTERPEL))
-		Flags &= ~(XVID_ME_QUARTERPELREFINE16+XVID_ME_QUARTERPELREFINE8+XVID_ME_QUARTERPELREFINE16_BITS+XVID_ME_QUARTERPELREFINE8_BITS);
+	if (!(GlobalFlags & XVID_QUARTERPEL))
+		Flags &= ~(PMV_QUARTERPELREFINE16+PMV_QUARTERPELREFINE8+QUARTERPELREFINE16_BITS+QUARTERPELREFINE8_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_HALFPEL))
+		Flags &= ~(PMV_EXTSEARCH16+PMV_HALFPELREFINE16+PMV_HALFPELREFINE8+HALFPELREFINE16_BITS+HALFPELREFINE8_BITS);
 
-	if ((VopFlags & XVID_VOP_GREYSCALE) || (VopFlags & XVID_VOP_REDUCED))
-		Flags &= ~(XVID_ME_CHROMA16 + XVID_ME_CHROMA8);
+	if (GlobalFlags & (XVID_GREYSCALE + XVID_REDUCED))
+		Flags &= ~(PMV_CHROMA16 + PMV_CHROMA8);
 
 	return Flags;
 }