--- trunk/xvidcore/src/motion/estimation.h	2004/12/05 04:53:01	1564
+++ trunk/xvidcore/src/motion/estimation.h	2004/12/09 04:58:12	1569
@@ -21,7 +21,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: estimation.h,v 1.7 2004-12-05 04:53:01 syskin Exp $
+ * $Id: estimation.h,v 1.10 2004-12-09 04:58:12 syskin Exp $
  *
  ****************************************************************************/
 
@@ -30,7 +30,6 @@
 
 #include "../portab.h"
 #include "../global.h"
-#include "../image/reduced.h"
 
 /* hard coded motion search parameters */
 
@@ -69,6 +68,8 @@
 
 typedef struct
 {
+	int max_dx, min_dx, max_dy, min_dy; /* maximum search range */
+
 	/* data modified by CheckCandidates */
 	int32_t iMinSAD[5];			/* smallest SADs found so far */
 	VECTOR currentMV[5];		/* best vectors found so far */
@@ -78,7 +79,6 @@
 	int chromaX, chromaY, chromaSAD; /* info to make ChromaSAD faster */
 
 	/* general fields */
-	int max_dx, min_dx, max_dy, min_dy; /* maximum range */
 	uint32_t rounding;			/* rounding type in use */
 	VECTOR predMV;				/* vector which predicts current vector */
 	const uint8_t * RefP[6];	/* reference pictures - N, V, H, HV, cU, cV */
@@ -114,6 +114,7 @@
 	const uint16_t * scan_table; /* current scan table */
 	const uint16_t * mpeg_quant_matrices;			/* current MPEG quantization matrices */
 	int lambda[6];				/* R-D lambdas for all 6 blocks */
+	unsigned int quant_sq;		/* quant squared - saves many multiplications in VHQ */
 
 } SearchData;
 
@@ -193,5 +194,7 @@
 					 const MBParam * const pParam,
 					 int x, int y);
 
+unsigned int
+getMinFcode(const int MVmax);
 
 #endif							/* _ESTIMATION_H_ */