--- trunk/xvidcore/src/motion/motion_comp.c	2002/09/07 09:08:38	436
+++ trunk/xvidcore/src/motion/motion_comp.c	2002/09/07 09:12:22	437
@@ -130,17 +130,7 @@
 		dy = (dy & 3) ? (dy >> 1) | 1 : dy / 2;
 
 		/* uv-image-based compensation */
-/* Always do block-based compensation, until check for HALFPEL is possible 
-#ifdef BFRAMES
-		compensate8x8_halfpel(&dct_codes[4 * 64], cur->u, ref->u, refh->u,
-							  refv->u, refhv->u, 8 * i, 8 * j, dx, dy,
-							  edged_width / 2);
-		compensate8x8_halfpel(&dct_codes[5 * 64], cur->v, ref->v, refh->v,
-							  refv->v, refhv->v, 8 * i, 8 * j, dx, dy,
-							  edged_width / 2);
-#else
-*/
-		/* uv-block-based compensation */
+
 		interpolate8x8_switch(refv->u, ref->u, 8 * i, 8 * j, dx, dy,
 							  edged_width / 2, rounding);
 		transfer_8to16sub(&dct_codes[4 * 64],
@@ -154,9 +144,7 @@
 						  cur->v + 8 * j * edged_width / 2 + 8 * i,
 						  refv->v + 8 * j * edged_width / 2 + 8 * i,
 						  edged_width / 2);
-/*
-#endif
-*/
+
 	} else						// mode == MODE_INTER4V
 	{
 		int32_t sum, dx, dy;
@@ -182,15 +170,6 @@
 		dy = (sum ? SIGN(sum) *
 			  (roundtab[ABS(sum) % 16] + (ABS(sum) / 16) * 2) : 0);
 
-		/* uv-image-based compensation */
-#ifdef BFRAMES
-		compensate8x8_halfpel(&dct_codes[4 * 64], cur->u, ref->u, refh->u,
-							  refv->u, refhv->u, 8 * i, 8 * j, dx, dy,
-							  edged_width / 2);
-		compensate8x8_halfpel(&dct_codes[5 * 64], cur->v, ref->v, refh->v,
-							  refv->v, refhv->v, 8 * i, 8 * j, dx, dy,
-							  edged_width / 2);
-#else
 		/* uv-block-based compensation */
 		interpolate8x8_switch(refv->u, ref->u, 8 * i, 8 * j, dx, dy,
 							  edged_width / 2, rounding);
@@ -205,235 +184,5 @@
 						  cur->v + 8 * j * edged_width / 2 + 8 * i,
 						  refv->v + 8 * j * edged_width / 2 + 8 * i,
 						  edged_width / 2);
-#endif
-	}
-}
-
-
-void
-MBMotionCompensationBVOP(MBParam * pParam,
-						 MACROBLOCK * const mb,
-						 const uint32_t i,
-						 const uint32_t j,
-						 IMAGE * const cur,
-						 const IMAGE * const f_ref,
-						 const IMAGE * const f_refh,
-						 const IMAGE * const f_refv,
-						 const IMAGE * const f_refhv,
-						 const IMAGE * const b_ref,
-						 const IMAGE * const b_refh,
-						 const IMAGE * const b_refv,
-						 const IMAGE * const b_refhv,
-						 int16_t * dct_codes)
-{
-	static const uint32_t roundtab[16] =
-		{ 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2 };
-
-	const int32_t edged_width = pParam->edged_width;
-	int32_t dx, dy;
-	int32_t b_dx, b_dy;
-	int k,sum;
-	int x = i;
-	int y = j;
-
-
-	switch (mb->mode) {
-	case MODE_FORWARD:
-		dx = mb->mvs[0].x;
-		dy = mb->mvs[0].y;
-
-		transfer_8to16sub_c(&dct_codes[0 * 64],
-							cur->y + (j * 16) * edged_width + (i * 16),
-							get_ref(f_ref->y, f_refh->y, f_refv->y, f_refhv->y,
-									i * 16, j * 16, 1, dx, dy, edged_width),
-							edged_width);
-
-		transfer_8to16sub(&dct_codes[1 * 64],
-						  cur->y + (j * 16) * edged_width + (i * 16 + 8),
-						  get_ref(f_ref->y, f_refh->y, f_refv->y, f_refhv->y,
-								  i * 16 + 8, j * 16, 1, dx, dy, edged_width),
-						  edged_width);
-
-		transfer_8to16sub_c(&dct_codes[2 * 64],
-							cur->y + (j * 16 + 8) * edged_width + (i * 16),
-							get_ref(f_ref->y, f_refh->y, f_refv->y, f_refhv->y,
-									i * 16, j * 16 + 8, 1, dx, dy,
-									edged_width), edged_width);
-
-		transfer_8to16sub(&dct_codes[3 * 64],
-						  cur->y + (j * 16 + 8) * edged_width + (i * 16 + 8),
-						  get_ref(f_ref->y, f_refh->y, f_refv->y, f_refhv->y,
-								  i * 16 + 8, j * 16 + 8, 1, dx, dy,
-								  edged_width), edged_width);
-
-
-		dx = (dx & 3) ? (dx >> 1) | 1 : dx / 2;
-		dy = (dy & 3) ? (dy >> 1) | 1 : dy / 2;
-
-		/* uv-image-based compensation */
-		compensate8x8_halfpel(&dct_codes[4 * 64], cur->u, f_ref->u, f_refh->u,
-							  f_refv->u, f_refhv->u, 8 * i, 8 * j, dx, dy,
-							  edged_width / 2);
-		compensate8x8_halfpel(&dct_codes[5 * 64], cur->v, f_ref->v, f_refh->v,
-							  f_refv->v, f_refhv->v, 8 * i, 8 * j, dx, dy,
-							  edged_width / 2);
-
-		break;
-
-	case MODE_BACKWARD:
-		b_dx = mb->b_mvs[0].x;
-		b_dy = mb->b_mvs[0].y;
-
-		transfer_8to16sub_c(&dct_codes[0 * 64],
-							cur->y + (j * 16) * edged_width + (i * 16),
-							get_ref(b_ref->y, b_refh->y, b_refv->y, b_refhv->y,
-									i * 16, j * 16, 1, b_dx, b_dy,
-									edged_width), edged_width);
-
-		transfer_8to16sub(&dct_codes[1 * 64],
-						  cur->y + (j * 16) * edged_width + (i * 16 + 8),
-						  get_ref(b_ref->y, b_refh->y, b_refv->y, b_refhv->y,
-								  i * 16 + 8, j * 16, 1, b_dx, b_dy,
-								  edged_width), edged_width);
-
-		transfer_8to16sub_c(&dct_codes[2 * 64],
-							cur->y + (j * 16 + 8) * edged_width + (i * 16),
-							get_ref(b_ref->y, b_refh->y, b_refv->y, b_refhv->y,
-									i * 16, j * 16 + 8, 1, b_dx, b_dy,
-									edged_width), edged_width);
-
-		transfer_8to16sub(&dct_codes[3 * 64],
-						  cur->y + (j * 16 + 8) * edged_width + (i * 16 + 8),
-						  get_ref(b_ref->y, b_refh->y, b_refv->y, b_refhv->y,
-								  i * 16 + 8, j * 16 + 8, 1, b_dx, b_dy,
-								  edged_width), edged_width);
-
-		b_dx = (b_dx & 3) ? (b_dx >> 1) | 1 : b_dx / 2;
-		b_dy = (b_dy & 3) ? (b_dy >> 1) | 1 : b_dy / 2;
-
-		/* uv-image-based compensation */
-		compensate8x8_halfpel(&dct_codes[4 * 64], cur->u, b_ref->u, b_refh->u,
-							  b_refv->u, b_refhv->u, 8 * i, 8 * j, b_dx, b_dy,
-							  edged_width / 2);
-		compensate8x8_halfpel(&dct_codes[5 * 64], cur->v, b_ref->v, b_refh->v,
-							  b_refv->v, b_refhv->v, 8 * i, 8 * j, b_dx, b_dy,
-							  edged_width / 2);
-
-		break;
-
-
-	case MODE_INTERPOLATE:		/* _could_ use DIRECT, but would be overkill (no 4MV there) */
-
-		dx = mb->mvs[0].x;
-		dy = mb->mvs[0].y;
-
-		b_dx = mb->b_mvs[0].x;
-		b_dy = mb->b_mvs[0].y;
-
-		for (k=0;k<4;k++)
-		{
-			transfer_8to16sub2_c(&dct_codes[k * 64],
-							 cur->y + (i * 16+(k&1)*8) + (j * 16+((k>>1)*8)) * edged_width,
-							 get_ref(f_ref->y, f_refh->y, f_refv->y,
-									 f_refhv->y, 2*i + (k&1), 2*j + (k>>1), 8, dx, dy,
-									 edged_width), 
-							 get_ref(b_ref->y, b_refh->y, b_refv->y,
-									 b_refhv->y, 2*i + (k&1), 2 * j+(k>>1), 8, b_dx, b_dy, 
-									 edged_width),
-							 edged_width);
-		}
-
-		dx = (dx & 3) ? (dx >> 1) | 1 : dx / 2;
-		dy = (dy & 3) ? (dy >> 1) | 1 : dy / 2;
-
-		b_dx = (b_dx & 3) ? (b_dx >> 1) | 1 : b_dx / 2;
-		b_dy = (b_dy & 3) ? (b_dy >> 1) | 1 : b_dy / 2;
-
-		transfer_8to16sub2_c(&dct_codes[4 * 64],
-							 cur->u + (y * 8) * edged_width / 2 + (x * 8),
-							 get_ref(f_ref->u, f_refh->u, f_refv->u,
-									 f_refhv->u, i, j, 8, dx, dy,
-									 edged_width / 2), 
-							 get_ref(b_ref->u, b_refh->u, b_refv->u,
-									 b_refhv->u, i, j, 8, b_dx, b_dy,
-									 edged_width / 2),
-							 edged_width / 2);
-
-		transfer_8to16sub2_c(&dct_codes[5 * 64],
-							 cur->v + (y * 8) * edged_width / 2 + (x * 8),
-							 get_ref(f_ref->v, f_refh->v, f_refv->v,
-									 f_refhv->v, 8 * i, 8 * j, 1, dx, dy,
-									 edged_width / 2), 
-							 get_ref(b_ref->v, b_refh->v, b_refv->v, 
-							 		 b_refhv->v, 8 * i, 8 * j, 1, b_dx, b_dy,
-									 edged_width / 2),
-							 edged_width / 2);
-
-		break;
-	
-	case MODE_DIRECT:
-
-		for (k=0;k<4;k++)
-		{
-			dx = mb->mvs[k].x;
-			dy = mb->mvs[k].y;
-		
-			b_dx = mb->b_mvs[k].x;
-			b_dy = mb->b_mvs[k].y;
-
-//		fprintf(stderr,"Direct Vector %d -- %d:%d    %d:%d\n",k,dx,dy,b_dx,b_dy);
-
-			transfer_8to16sub2_c(&dct_codes[k * 64],
-							 cur->y + (i*16 + (k&1)*8) + (j*16 + (k>>1)*8 ) * edged_width,
-							 get_ref(f_ref->y, f_refh->y, f_refv->y, f_refhv->y, 
-							 		 2*i + (k&1), 2*j + (k>>1), 8, dx, dy,
-									 edged_width), 
-							 get_ref(b_ref->y, b_refh->y, b_refv->y, b_refhv->y, 
-							 		 2*i + (k&1), 2*j + (k>>1), 8, b_dx, b_dy, 
-									 edged_width),
-							 edged_width);
-		}
-
-		sum = mb->mvs[0].x + mb->mvs[1].x + mb->mvs[2].x + mb->mvs[3].x;
-		dx = (sum == 0 ? 0 : SIGN(sum) * (roundtab[ABS(sum) % 16] + (ABS(sum) / 16) * 2));
-
-		sum = mb->mvs[0].y + mb->mvs[1].y + mb->mvs[2].y + mb->mvs[3].y;
-		dy = (sum == 0 ? 0 : SIGN(sum) * (roundtab[ABS(sum) % 16] + (ABS(sum) / 16) * 2));
-
-
-		sum = mb->b_mvs[0].x + mb->b_mvs[1].x + mb->b_mvs[2].x + mb->b_mvs[3].x;
-		b_dx = (sum == 0 ? 0 : SIGN(sum) * (roundtab[ABS(sum) % 16] + (ABS(sum) / 16) * 2));
-
-		sum = mb->b_mvs[0].y + mb->b_mvs[1].y + mb->b_mvs[2].y + mb->b_mvs[3].y;
-		b_dy = (sum == 0 ? 0 : SIGN(sum) * (roundtab[ABS(sum) % 16] + (ABS(sum) / 16) * 2));
-
-/*		// for QPel don't forget to always do
-
-		if (quarterpel)
-			sum /= 2;		
-*/
-
-		transfer_8to16sub2_c(&dct_codes[4 * 64],
-							 cur->u + (y * 8) * edged_width / 2 + (x * 8),
-							 get_ref(f_ref->u, f_refh->u, f_refv->u,
-									 f_refhv->u, i, j, 8, dx, dy,
-									 edged_width / 2), 
-							 get_ref(b_ref->u, b_refh->u, b_refv->u,
-									 b_refhv->u, i, j, 8, b_dx, b_dy,
-									 edged_width / 2),
-							 edged_width / 2);
-
-		transfer_8to16sub2_c(&dct_codes[5 * 64],
-							 cur->v + (y * 8) * edged_width / 2 + (x * 8),
-							 get_ref(f_ref->v, f_refh->v, f_refv->v,
-									 f_refhv->v, i, j, 8, dx, dy,
-									 edged_width / 2), 
-							 get_ref(b_ref->v, b_refh->v, b_refv->v, 
-							 		 b_refhv->v, i, j, 8, b_dx, b_dy,
-									 edged_width / 2),
-							 edged_width / 2);
-
-
-		break;
 	}
 }