--- motion.h	2002/10/30 18:01:34	1.13.2.4
+++ motion.h	2003/02/19 20:12:43	1.20
@@ -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.h,v 1.13.2.4 2002/10/30 18:01:34 Isibaar Exp $
+ *  $Id: motion.h,v 1.20 2003/02/19 20:12:43 edgomez Exp $
  *
  ***************************************************************************/
 
@@ -42,20 +42,19 @@
 #define MVzero(A) ( ((A).x)==(0) && ((A).y)==(0) )
 #define MVequal(A,B) ( ((A).x)==((B).x) && ((A).y)==((B).y) )
 
-static const uint32_t roundtab[16] =
-		{ 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2 };
+/*****************************************************************************
+ * Modified rounding tables -- defined in motion_est.c
+ * Original tables see ISO spec tables 7-6 -> 7-9
+ ****************************************************************************/
 
-/*
- * modified rounding tables
- * original tables see ISO spec tables 7-6 -> 7-9
- */
+extern const uint32_t roundtab[16];
 
 /* K = 4 */
-static const uint32_t roundtab_76[16] = { 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 1, 1 };
+extern const uint32_t roundtab_76[16];
 /* K = 2 */
-static const uint32_t roundtab_78[8] = { 0, 0, 1, 1, 0, 0, 0, 1  };
+extern const uint32_t roundtab_78[8];
 /* K = 1 */
-static const uint32_t roundtab_79[4] = { 0, 1, 0, 0 };
+extern const uint32_t roundtab_79[4];
 
 
 /*
@@ -75,7 +74,7 @@
 
 		const int32_t dx,
 		const int32_t dy,
-		const uint32_t stride)
+		const int32_t stride)
 {
 
 
@@ -109,7 +108,7 @@
 
 		   const VECTOR * mv,	/* measured in half-pel! */
 
-		   const uint32_t stride)
+		   const int32_t stride)
 {
 
 	switch ((((mv->x) & 1) << 1) + ((mv->y) & 1)) {
@@ -141,7 +140,7 @@
 						  const IMAGE * const f_refV,
 						  const IMAGE * const f_refHV,
 						  // backward (future) reference
-						  const MACROBLOCK * const b_mbs,
+						  const FRAMEINFO * const b_reference,
 						  const IMAGE * const b_ref,
 						  const IMAGE * const b_refH,
 						  const IMAGE * const b_refV,
@@ -161,6 +160,44 @@
 							  const IMAGE * const b_refv,
 							  const IMAGE * const b_refhv,
 							  int16_t * dct_codes);
+							  
+							  
+/* GMC stuff. Maybe better put it into a separate file */
+							  
+void 
+generate_GMCparameters(	const int num_wp,				// [input]: number of warppoints
+						const int res, 					// [input]: resolution 
+						const WARPPOINTS *const warp, 	// [input]: warp points  
+						const int width, const int height, 	// [input]: without edges!
+						GMC_DATA *const gmc); 		// [output] precalculated parameters 
+
+void 
+generate_GMCimage(	const GMC_DATA *const gmc_data, 	// [input] precalculated data
+					const IMAGE *const pRef,			// [input] 
+					const int mb_width, 
+					const int mb_height,
+					const int stride,
+					const int stride2, 
+					const int fcode, 					// [input] some parameters...
+  					const int32_t quarterpel,			// [input] for rounding avgMV
+					const int reduced_resolution,		// [input] ignored
+					const int32_t rounding,			// [input] for rounding image data
+					MACROBLOCK *const pMBs, 	// [output] average motion vectors
+					IMAGE *const pGMC);			// [output] full warped image
+					
+
+VECTOR generate_GMCimageMB(	const GMC_DATA *const gmc_data, 	/* [input] all precalc data */
+							const IMAGE *const pRef,			// [input] 
+							const int mi, const int mj, 		/* [input] MB position  */
+							const int stride,					/* [input] Lumi stride */
+							const int stride2,					/* [input] chroma stride */
+							const int quarterpel, 				/* [input] for rounding of AvgMV */
+							const int rounding, 				
+							IMAGE *const pGMC);					/* [outut] generate image */
+
+
+
+/* Hinted ME */
 
 void
 MotionEstimationHinted(	MBParam * const pParam,
@@ -172,14 +209,18 @@
 
 int
 MEanalysis(	const IMAGE * const pRef,	
-			const IMAGE * const pCurrent,
+			FRAMEINFO * const Current,
 			MBParam * const pParam,
-			MACROBLOCK * const pMBs,
-			const uint32_t iFcode);
+			int maxIntra,
+			int intraCount,
+			int bCount);
 
 int
 FindFcode(	const MBParam * const pParam,
 			const FRAMEINFO * const current);
 
 
+int d_amv_penalty(int x, int y, const VECTOR pred, const uint32_t iFcode, const int quant);
+				
+
 #endif							/* _MOTION_H_ */