--- decoder.c	2003/06/09 19:41:53	1.49.2.8
+++ decoder.c	2003/08/13 11:43:47	1.49.2.11
@@ -20,7 +20,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: decoder.c,v 1.49.2.8 2003/06/09 19:41:53 edgomez Exp $
+ * $Id: decoder.c,v 1.49.2.11 2003/08/13 11:43:47 edgomez Exp $
  *
  ****************************************************************************/
 
@@ -54,6 +54,7 @@
 #include "utils/timer.h"
 #include "utils/emms.h"
 #include "motion/motion.h"
+#include "motion/gmc.h"
 
 #include "image/image.h"
 #include "image/colorspace.h"
@@ -168,7 +169,7 @@
 {
 	DECODER *dec;
 
-	if (XVID_MAJOR(create->version) != 1)	/* v1.x.x */
+	if (XVID_VERSION_MAJOR(create->version) != 1)	/* v1.x.x */
 		return XVID_ERR_VERSION;
 
 	dec = xvid_malloc(sizeof(DECODER), CACHE_LINE);
@@ -583,19 +584,6 @@
 	stop_transfer_timer();
 }
 
-static __inline int gmc_sanitize(int value, int quarterpel, int fcode)
-{
-	int length = 1 << (fcode+4);
-
-/*	if (quarterpel) value *= 2; */
-
-	if (value < -length) 
-		return -length;
-	else if (value >= length) 
-		return length-1;
-	else return value;
-}
-
 
 static void
 decoder_mbgmc(DECODER * dec,
@@ -628,9 +616,18 @@
 	
 /* this is where the calculations are done */
 	
-	{
-		pMB->amv = generate_GMCimageMB(&dec->gmc_data, &dec->refn[0], x_pos, y_pos, 
-					stride, stride2, dec->quarterpel, rounding, &dec->cur);
+	{	NEW_GMC_DATA * gmc_data = &dec->new_gmc_data;
+
+			gmc_data->predict_16x16(gmc_data, 
+					dec->cur.y + y_pos*16*stride + x_pos*16, dec->refn[0].y, 
+					stride, stride, x_pos, y_pos, rounding);
+
+			gmc_data->predict_8x8(gmc_data,
+					dec->cur.u + y_pos*8*stride2 + x_pos*8, dec->refn[0].u,
+					dec->cur.v + y_pos*8*stride2 + x_pos*8, dec->refn[0].v,
+					stride2, stride2, x_pos, y_pos, rounding);
+
+			gmc_data->get_average_mv(gmc_data, &pMB->amv, x_pos, y_pos, dec->quarterpel);
 
 		pMB->amv.x = gmc_sanitize(pMB->amv.x, dec->quarterpel, fcode);
 		pMB->amv.y = gmc_sanitize(pMB->amv.y, dec->quarterpel, fcode);
@@ -861,25 +858,17 @@
 	{	
 
 		/* accuracy:  0==1/2, 1=1/4, 2=1/8, 3=1/16 */
-		if ( (dec->sprite_warping_accuracy != 3) || (dec->sprite_warping_points != 2) )
-		{	
-			fprintf(stderr,"Wrong GMC parameters acc=%d(-> 1/%d), %d!!!\n",
+/*		{	
+			fprintf(stderr,"GMC parameters acc=%d(-> 1/%d), %d pts!!!\n",
 				dec->sprite_warping_accuracy,(2<<dec->sprite_warping_accuracy),
 				dec->sprite_warping_points);
-		}
-		
+		}*/
+
 		generate_GMCparameters(	dec->sprite_warping_points, 
-				(2 << dec->sprite_warping_accuracy), gmc_warp, 
-				dec->width, dec->height, &dec->gmc_data);
+				dec->sprite_warping_accuracy, gmc_warp, 
+				dec->width, dec->height, &dec->new_gmc_data);
 
 /* image warping is done block-based  in decoder_mbgmc(), now */	
-/*
-	generate_GMCimage(&dec->gmc_data, &dec->refn[0], 
-					mb_width, mb_height, 
-					dec->edged_width, dec->edged_width/2,
-					fcode, dec->quarterpel, 0, 
-					rounding, dec->mbs, &dec->gmc);
-*/
 	}
 
 	bound = 0;
@@ -1742,9 +1731,8 @@
 	WARPPOINTS gmc_warp;
 	int coding_type;
 	int success, output, seen_something;
-	idctFuncPtr idct_save;
 
-	if (XVID_MAJOR(frame->version) != 1 || (stats && XVID_MAJOR(stats->version) != 1))	/* v1.x.x */
+	if (XVID_VERSION_MAJOR(frame->version) != 1 || (stats && XVID_VERSION_MAJOR(stats->version) != 1))	/* v1.x.x */
 		return XVID_ERR_VERSION;
 
 	start_global_timer();
@@ -1788,7 +1776,6 @@
 	success = 0;
 	output = 0;
 	seen_something = 0;
-	idct_save = idct;
 
 repeat:
 
@@ -1830,15 +1817,6 @@
 
 	dec->p_bmv.x = dec->p_bmv.y = dec->p_fmv.y = dec->p_fmv.y = 0;	/* init pred vector to 0 */
 
-#if defined(ARCH_IS_IA32)
-	/*
-	 * /!\ Ugly hack /!\
-	 * IA32: Prior to xvid bitstream 10, we were using Walten's mmx/xmm idct
-	 */
-	if((idct == simple_idct_mmx) && (dec->bs_version < 10))
-		idct = idct_mmx;
-#endif
-
 	/* packed_mode: special-N_VOP treament */
 	if (dec->packed_mode && coding_type == N_VOP)
 	{
@@ -1967,7 +1945,5 @@
 	emms();
 	stop_global_timer();
 
-	idct = idct_save;
-
 	return BitstreamPos(&bs) / 8;	/* number of bytes consumed */
 }