--- branches/dev-api-3/xvidcore/src/motion/motion_est.h	2002/09/23 20:36:02	530
+++ branches/dev-api-3/xvidcore/src/motion/motion_est.h	2002/10/05 21:37:44	579
@@ -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.1.2.1 2002-09-23 20:36:02 chl Exp $
+ *  $Id: motion_est.h,v 1.1.2.4 2002-10-05 21:37:44 Isibaar Exp $
  *
  ***************************************************************************/
 
@@ -69,7 +69,7 @@
 	(int)(21.2656*NEIGH_TEND_16X16 + 0.5), (int)(24.8580*NEIGH_TEND_16X16 + 0.5),
 	(int)(29.6436*NEIGH_TEND_16X16 + 0.5), (int)(36.4949*NEIGH_TEND_16X16 + 0.5)	};
 
-static const int lambda_vec8[32] =
+static const int lambda_vec8[32] = 
 	{     0    ,(int)(1.00235 * NEIGH_TEND_8X8 + 0.5),
 	(int)(1.15582 + NEIGH_TEND_8X8 + 0.5), (int)(1.31976*NEIGH_TEND_8X8 + 0.5),
 	(int)(1.49591*NEIGH_TEND_8X8 + 0.5), (int)(1.68601*NEIGH_TEND_8X8 + 0.5),
@@ -95,17 +95,26 @@
 	10, 11, 11, 11, 11, 11, 11, 12, 12
 };
 
+static const int DQtab[4] = {
+	-1, -2, 1, 2
+};
+
+
 typedef struct
 	{
 // general fields
 		int max_dx, min_dx, max_dy, min_dy;
+		uint32_t rounding;
 		VECTOR predMV;
+		VECTOR predQMV;
 		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 * RefQ;
 		const uint8_t * Cur;
 		uint32_t iQuant;
 		uint32_t iEdgedWidth;
@@ -149,22 +158,24 @@
 		  const uint32_t block_sz,	/* block dimension, 8 or 16 */
 		  const uint32_t width,
 		  const uint32_t height,
-		  const uint32_t fcode)
+		  const uint32_t fcode,
+		  const uint32_t quarterpel)
 {
 
 	int k;
-	int high = (32 << (fcode - 1)) - 1;
+	const int search_range = 32 << (fcode - 1 - quarterpel);
+	const int high = search_range - 1;
+	const int low = -search_range;
 
 	k = 2 * (int)(width - x*block_sz);
 	*max_dx = MIN(high, k);
 	k = 2 * (int)(height -  y*block_sz);
 	*max_dy = MIN(high, k);
 	
-	high = -(32 << (fcode - 1));
 	k = -2 * (int)((x+1) * block_sz);
-	*min_dx = MAX(high, k);
+	*min_dx = MAX(low, k);
 	k = -2 * (int)((y+1) * block_sz);
-	*min_dy = MAX(high, k);
+	*min_dy = MAX(low, k);
 
 }
 
@@ -179,7 +190,8 @@
 			const MBParam * const pParam,
 			MACROBLOCK * const pMB,
 			const MACROBLOCK * const pMBs,
-			const int block);
+			const int block,
+			SearchData * const Data);
 
 bool
 MotionEstimation(MBParam * const pParam,
@@ -195,12 +207,13 @@
 		const uint8_t * const pRefH,
 		const uint8_t * const pRefV,
 		const uint8_t * const pRefHV,
+		const uint8_t * const pRefQ,
 		const IMAGE * const pCur,
 		const int x,
 		const int y,
 		const uint32_t MotionFlags,
 		const uint32_t iQuant,
-		const uint32_t iFcode,
+		SearchData * const Data,
 		const MBParam * const pParam,
 		const MACROBLOCK * const pMBs,
 		const MACROBLOCK * const prevMBs,