--- motion_est.h	2003/03/26 14:56:49	1.3.2.2
+++ motion_est.h	2003/05/14 18:46:39	1.3.2.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.2 2003/03/26 14:56:49 edgomez Exp $
+ *  $Id: motion_est.h,v 1.3.2.6 2003/05/14 18:46:39 edgomez Exp $
  *
  ***************************************************************************/
 
@@ -90,12 +90,14 @@
 	(int)(29.6436*NEIGH_TEND_8X8 + 0.5), (int)(36.4949*NEIGH_TEND_8X8 + 0.5)	};
 
 // mv.length table
-static const uint32_t mvtab[33] = {
-	1, 2, 3, 4, 6, 7, 7, 7,
-	9, 9, 9, 10, 10, 10, 10, 10,
-	10, 10, 10, 10, 10, 10, 10, 10,
-	10, 11, 11, 11, 11, 11, 11, 12, 12
-};
+static const int mvtab[64] = {
+		1, 2, 3, 4, 6, 7, 7, 7,
+		9, 9, 9, 10, 10, 10, 10, 10,
+		10, 10, 10, 10, 10, 10, 10, 10,
+		10, 11, 11, 11, 11, 11, 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 };
 
 static const int DQtab[4] = {
 	-1, -2, 1, 2
@@ -112,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;
@@ -131,19 +128,17 @@
 	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
 	VECTOR directmvF[4];
 	VECTOR directmvB[4];
 	const VECTOR * referencemv;
+// _BITS stuff
+	int16_t * dctSpace;
+	uint32_t iQuant;
+	uint32_t quant_type;
 
 } SearchData;
 
@@ -224,16 +219,14 @@
 		const int x,
 		const int y,
 		const uint32_t MotionFlags,
-		const uint32_t GlobalFlags,
-		const uint32_t iQuant,
+		const uint32_t VopFlags,
+		const uint32_t VolFlags,
 		SearchData * const Data,
 		const MBParam * const pParam,
 		const MACROBLOCK * const pMBs,
 		const MACROBLOCK * const prevMBs,
-		int inter4v,
 		MACROBLOCK * const pMB);
 
-
 static WARPPOINTS
 GlobalMotionEst(const MACROBLOCK * const pMBs, 
 				const MBParam * const pParam,
@@ -288,6 +281,7 @@
 #include "../quant/quant_mpeg4.h"
 #include "../quant/quant_h263.h"
 #include "../bitstream/vlc_codes.h"
+#include "../dct/fdct.h"
 
 static int
 CountMBBitsInter(SearchData * const Data,
@@ -307,5 +301,29 @@
 
 int CodeCoeffIntra_CalcBits(const int16_t qcoeff[64], const uint16_t * zigzag);
 int CodeCoeffInter_CalcBits(const int16_t qcoeff[64], const uint16_t * zigzag);
+/*
+static int
+CountDistortionSkip(const SearchData * const Data);
+*/
+static __inline unsigned int
+Block_CalcBits(uint16_t * const coeff, 
+					uint16_t * const data,
+					const uint32_t quant, const int quant_type,
+					uint32_t * cbp,
+					const int block,
+					const int RD)
+{
+	int sum;
+
+	fdct(data);
+
+	if (quant_type == 0) sum = quant_inter(coeff, data, quant);
+	else sum = quant4_inter(coeff, data, quant);
+
+	if (sum > 0) {
+		*cbp |= 1 << (5 - block);
+		return CodeCoeffInter_CalcBits(coeff, scan_tables[0]);
+	} else return 0;
+}
 
 #endif							/* _MOTION_EST_H_ */