--- trunk/xvidcore/src/motion/motion_inlines.h	2004/03/22 22:36:25	1382
+++ trunk/xvidcore/src/motion/motion_inlines.h	2007/04/28 16:30:26	1773
@@ -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: motion_inlines.h,v 1.2 2004-03-22 22:36:24 edgomez Exp $
+ * $Id: motion_inlines.h,v 1.5 2007-04-28 16:30:20 syskin Exp $
  *
  ****************************************************************************/
 
@@ -44,21 +44,14 @@
 		  uint32_t block_sz, /* block dimension, 3(8) or 4(16) */
 		  const uint32_t width,
 		  const uint32_t height,
-		  const uint32_t fcode,
-		  const int precision, /* 2 for qpel, 1 for halfpel */
-		  const int rrv)
+		  const int fcode,
+		  const int precision) /* 2 for qpel, 1 for halfpel */
 {
 	int k;
-	const int search_range = 16 << fcode;
+	const int search_range = 1 << (4+fcode);
 	int high = search_range - 1;
 	int low = -search_range;
 
-	if (rrv) {
-		high = RRV_MV_SCALEUP(high);
-		low = RRV_MV_SCALEUP(low);
-		block_sz++;
-	}
-
 	k = (int)(width - (x<<block_sz))<<precision;
 	*max_dx = MIN(high, k);
 	k = (int)(height -  (y<<block_sz))<<precision;
@@ -71,8 +64,8 @@
 }
 
 /* reversed mv.length table */
-static const int r_mvtab[64] = {
-	12, 12, 12, 12, 12, 12, 12, 12,
+static const int r_mvtab[65] = {
+	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, 12, 12, 12, 12, 12, 12,
@@ -83,25 +76,24 @@
 };
 
 static __inline uint32_t
-d_mv_bits(int x, int y, const VECTOR pred, const uint32_t iFcode, const int qpel, const int rrv)
+d_mv_bits(int x, int y, const VECTOR pred, const uint32_t iFcode, const int qpel)
 {
 	unsigned int bits;
 
 	x <<= qpel;
 	y <<= qpel;
-	if (rrv) { x = RRV_MV_SCALEDOWN(x); y = RRV_MV_SCALEDOWN(y); }
 
 	x -= pred.x;
 	bits = (x != 0 ? iFcode:0);
 	x = -abs(x);
 	x >>= (iFcode - 1);
-	bits += r_mvtab[x+63];
+	bits += r_mvtab[x+64];
 
 	y -= pred.y;
 	bits += (y != 0 ? iFcode:0);
 	y = -abs(y);
 	y >>= (iFcode - 1);
-	bits += r_mvtab[y+63];
+	bits += r_mvtab[y+64];
 
 	return bits;
 }