--- trunk/xvidcore/src/motion/estimation.h	2004/12/08 12:43:48	1567
+++ trunk/xvidcore/src/motion/estimation.h	2005/03/14 00:47:08	1604
@@ -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.9 2004-12-08 12:43:48 syskin Exp $
+ * $Id: estimation.h,v 1.12 2005-03-14 00:47:07 Isibaar Exp $
  *
  ****************************************************************************/
 
@@ -40,8 +40,8 @@
 #define MV16_INTER_BIAS	450
 
 /* vector map (vlc delta size) smoother parameters ! float !*/
-#define NEIGH_TEND_16X16		10.5
-#define NEIGH_TEND_8X8			40.0
+#define NEIGH_TEND_16X16		0.6
+#define NEIGH_TEND_8X8			0.6
 #define NEIGH_8X8_BIAS			40
 
 #define BITS_MULT				16
@@ -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;
 
@@ -191,7 +192,8 @@
 					 VECTOR * b_predMV,
 					 const uint32_t MotionFlags,
 					 const MBParam * const pParam,
-					 int x, int y);
+					 int x, int y,
+					 int best_sad);
 
 unsigned int
 getMinFcode(const int MVmax);