--- trunk/xvidcore/src/encoder.c	2004/12/10 04:10:12	1573
+++ trunk/xvidcore/src/encoder.c	2006/02/23 07:22:43	1680
@@ -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: encoder.c,v 1.115 2004-12-10 04:10:12 syskin Exp $
+ * $Id: encoder.c,v 1.125 2006-02-23 07:22:43 syskin Exp $
  *
  ****************************************************************************/
 
@@ -85,20 +85,31 @@
 /*
  * Simplify the "fincr/fbase" fraction
 */
+static int
+gcd(int a, int b)
+{
+	int r ;
+
+	if (b > a) {
+		r = a;
+		a = b;
+		b = r;
+	}
+
+	while ((r = a % b)) {
+		a = b;
+		b = r;
+	}
+	return b;
+}
+
 static void
 simplify_time(int *inc, int *base)
 {
 	/* common factor */
-	int i = *inc;
-	while (i > 1) {
-		if (*inc % i == 0 && *base % i == 0) {
-			*inc /= i;
-			*base /= i;
-			i = *inc;
-			continue;
-		}
-		i--;
-	}
+	const int s = gcd(*inc, *base);
+  *inc  /= s;
+  *base /= s;
 
 	if (*base > 65535 || *inc > 65535) {
 		int *biggest;
@@ -114,8 +125,8 @@
 		}
 		
 		div = ((float)*biggest)/((float)65535);
-		*biggest = (int)(((float)*biggest)/div);
-		*other = (int)(((float)*other)/div);
+		*biggest = (unsigned int)(((float)*biggest)/div);
+		*other = (unsigned int)(((float)*other)/div);
 	}
 }
 
@@ -146,6 +157,8 @@
 
 	/* global flags */
 	pEnc->mbParam.global_flags = create->global;
+  if ((pEnc->mbParam.global_flags & XVID_GLOBAL_PACKED))
+    pEnc->mbParam.global_flags |= XVID_GLOBAL_DIVX5_USERDATA;
 
 	/* width, height */
 	pEnc->mbParam.width = create->width;
@@ -159,7 +172,7 @@
 	pEnc->mbParam.fincr = MAX(create->fincr, 0);
 	pEnc->mbParam.fbase = create->fincr <= 0 ? 25 : create->fbase;
 	if (pEnc->mbParam.fincr>0)
-		simplify_time(&pEnc->mbParam.fincr, &pEnc->mbParam.fbase);
+		simplify_time((int*)&pEnc->mbParam.fincr, (int*)&pEnc->mbParam.fbase);
 
 	/* zones */
 	if(create->num_zones > 0) {
@@ -190,7 +203,7 @@
 
 		memset(&pinfo, 0, sizeof(xvid_plg_info_t));
 		pinfo.version = XVID_VERSION;
-		if (create->plugins[n].func(0, XVID_PLG_INFO, &pinfo, 0) >= 0) {
+		if (create->plugins[n].func(NULL, XVID_PLG_INFO, &pinfo, NULL) >= 0) {
 			pEnc->mbParam.plugin_flags |= pinfo.flags;
 		}
 
@@ -207,7 +220,7 @@
 		pcreate.param = create->plugins[n].param;
 
 		pEnc->plugins[n].func = NULL;   /* disable plugins that fail */
-		if (create->plugins[n].func(0, XVID_PLG_CREATE, &pcreate, &pEnc->plugins[n].param) >= 0) {
+		if (create->plugins[n].func(NULL, XVID_PLG_CREATE, &pcreate, &pEnc->plugins[n].param) >= 0) {
 			pEnc->plugins[n].func = create->plugins[n].func;
 		}
 	}
@@ -225,6 +238,14 @@
 			goto xvid_err_memory1a;
 	}
 
+	/* temp lambdas */
+	if (pEnc->mbParam.plugin_flags & XVID_REQLAMBDA) {
+		pEnc->temp_lambda = (float *) xvid_malloc(pEnc->mbParam.mb_width *
+						pEnc->mbParam.mb_height * 6 * sizeof(float), CACHE_LINE);
+		if (pEnc->temp_lambda == NULL)
+			goto xvid_err_memory1a;
+	}
+
 	/* bframes */
 	pEnc->mbParam.max_bframes = MAX(create->max_bframes, 0);
 	pEnc->mbParam.bquant_ratio = MAX(create->bquant_ratio, 0);
@@ -506,10 +527,14 @@
 		xvid_free(pEnc->temp_dquants);
 	}
 
+	if(pEnc->mbParam.plugin_flags & XVID_REQLAMBDA) {
+		xvid_free(pEnc->temp_lambda);
+	}
+
   xvid_err_memory0:
 	for (n=0; n<pEnc->num_plugins;n++) {
 		if (pEnc->plugins[n].func) {
-			pEnc->plugins[n].func(pEnc->plugins[n].param, XVID_PLG_DESTROY, 0, 0);
+			pEnc->plugins[n].func(pEnc->plugins[n].param, XVID_PLG_DESTROY, NULL, NULL);
 		}
 	}
 	xvid_free(pEnc->plugins);
@@ -614,7 +639,7 @@
 
 		for (i=0; i<pEnc->num_plugins;i++) {
 			if (pEnc->plugins[i].func) {
-				pEnc->plugins[i].func(pEnc->plugins[i].param, XVID_PLG_DESTROY, &pdestroy, 0);
+				pEnc->plugins[i].func(pEnc->plugins[i].param, XVID_PLG_DESTROY, &pdestroy, NULL);
 			}
 		}
 		xvid_free(pEnc->plugins);
@@ -638,7 +663,7 @@
 static void call_plugins(Encoder * pEnc, FRAMEINFO * frame, IMAGE * original,
 						 int opt, int * type, int * quant, xvid_enc_stats_t * stats)
 {
-	unsigned int i, j;
+	unsigned int i, j, k;
 	xvid_plg_data_t data;
 
 	/* set data struct */
@@ -697,9 +722,18 @@
 		if ((pEnc->mbParam.plugin_flags & XVID_REQDQUANTS)) {
 			data.dquant = pEnc->temp_dquants;
 			data.dquant_stride = pEnc->mbParam.mb_width;
-			memset(data.dquant, 0, data.mb_width*data.mb_height);
+			memset(data.dquant, 0, data.mb_width*data.mb_height*sizeof(int));
 		}
-	
+
+		if(pEnc->mbParam.plugin_flags & XVID_REQLAMBDA) {
+			int block = 0;
+			data.lambda = pEnc->temp_lambda;
+			for(i = 0;i < pEnc->mbParam.mb_height; i++)
+				for(j = 0;j < pEnc->mbParam.mb_width; j++)
+					for (k = 0; k < 6; k++) 
+						data.lambda[block++] = 1.0f;
+		}
+
 	} else { /* XVID_PLG_AFTER */
 		if ((pEnc->mbParam.plugin_flags & XVID_REQORIGINAL)) {
 			data.original.csp = XVID_CSP_PLANAR;
@@ -774,7 +808,7 @@
 	for (i=0; i<(unsigned int)pEnc->num_plugins;i++) {
 		emms();
 		if (pEnc->plugins[i].func) {
-			if (pEnc->plugins[i].func(pEnc->plugins[i].param, opt, &data, 0) < 0) {
+			if (pEnc->plugins[i].func(pEnc->plugins[i].param, opt, &data, NULL) < 0) {
 				continue;
 			}
 		}
@@ -803,6 +837,23 @@
 				frame->mbs[j*pEnc->mbParam.mb_width + i].dquant = 0;
 			}
 		}
+
+		if (pEnc->mbParam.plugin_flags & XVID_REQLAMBDA) {
+			for (j = 0; j < pEnc->mbParam.mb_height; j++)
+				for (i = 0; i < pEnc->mbParam.mb_width; i++)
+					for (k = 0; k < 6; k++) {
+						frame->mbs[j*pEnc->mbParam.mb_width + i].lambda[k] = 
+							(int) ((float)(1<<LAMBDA_EXP) * data.lambda[6 * (j * data.mb_width + i) + k]);
+			}
+		} else {
+			for (j = 0; j<pEnc->mbParam.mb_height; j++)
+				for (i = 0; i<pEnc->mbParam.mb_width; i++)
+					for (k = 0; k < 6; k++) {
+						frame->mbs[j*pEnc->mbParam.mb_width + i].lambda[k] = 1<<LAMBDA_EXP;
+			}
+		}
+
+
 		frame->mbs[0].quant = data.quant; /* FRAME will not affect the quant in stats */
 	}
 
@@ -872,24 +923,6 @@
 #endif
 }
 
-static int
-gcd(int a, int b)
-{
-	int r ;
-
-	if (b > a) {
-		r = a;
-		a = b;
-		b = r;
-	}
-
-	while ((r = a % b)) {
-		a = b;
-		b = r;
-	}
-	return b;
-}
-
 static void
 simplify_par(int *par_width, int *par_height)
 {
@@ -1015,7 +1048,7 @@
 			}
 
 			FrameCodeB(pEnc, pEnc->bframes[pEnc->bframenum_head], &bs);
-			call_plugins(pEnc, pEnc->bframes[pEnc->bframenum_head], &pEnc->sOriginal2, XVID_PLG_AFTER, 0, 0, stats);
+			call_plugins(pEnc, pEnc->bframes[pEnc->bframenum_head], &pEnc->sOriginal2, XVID_PLG_AFTER, NULL, NULL, stats);
 			pEnc->bframenum_head++;
 
 			goto done;
@@ -1047,7 +1080,7 @@
 
 			/* add the not-coded length to the reference frame size */
 			pEnc->current->length += (BitstreamPos(&bs) - bits) / 8;
-			call_plugins(pEnc, pEnc->current, &pEnc->sOriginal, XVID_PLG_AFTER, 0, 0, stats);
+			call_plugins(pEnc, pEnc->current, &pEnc->sOriginal, XVID_PLG_AFTER, NULL, NULL, stats);
 
 			/* flush complete: reset counters */
 			pEnc->flush_bframes = 0;
@@ -1075,7 +1108,7 @@
 				pEnc->queue_head, pEnc->queue_tail, pEnc->queue_size);
 
 			if (!(pEnc->mbParam.global_flags & XVID_GLOBAL_PACKED) && pEnc->mbParam.max_bframes > 0) {
-				call_plugins(pEnc, pEnc->current, &pEnc->sOriginal, XVID_PLG_AFTER, 0, 0, stats);
+				call_plugins(pEnc, pEnc->current, &pEnc->sOriginal, XVID_PLG_AFTER, NULL, NULL, stats);
 			}
 
 			/* if the very last frame is to be b-vop, we must change it to a p-vop */
@@ -1104,7 +1137,7 @@
 
 
 				if ((pEnc->mbParam.global_flags & XVID_GLOBAL_PACKED) && pEnc->bframenum_tail==0) {
-					call_plugins(pEnc, pEnc->current, &pEnc->sOriginal, XVID_PLG_AFTER, 0, 0, stats);
+					call_plugins(pEnc, pEnc->current, &pEnc->sOriginal, XVID_PLG_AFTER, NULL, NULL, stats);
 				}else{
 					pEnc->flush_bframes = 1;
 					goto done;
@@ -1153,7 +1186,7 @@
 	type = frame->type;
 	pEnc->current->quant = frame->quant;
 
-	call_plugins(pEnc, pEnc->current, NULL, XVID_PLG_BEFORE, &type, &pEnc->current->quant, stats);
+	call_plugins(pEnc, pEnc->current, NULL, XVID_PLG_BEFORE, &type, (int*)&pEnc->current->quant, stats);
 
 	if (type > 0){ 	/* XVID_TYPE_?VOP */
 		type = type2coding(type);	/* convert XVID_TYPE_?VOP to bitstream coding type */
@@ -1228,7 +1261,7 @@
 	if (!(pEnc->mbParam.global_flags & XVID_GLOBAL_PACKED) && pEnc->mbParam.max_bframes > 0)
 	{
 		if (pEnc->current->stamp > 0) {
-			call_plugins(pEnc, pEnc->reference, &pEnc->sOriginal, XVID_PLG_AFTER, 0, 0, stats);
+			call_plugins(pEnc, pEnc->reference, &pEnc->sOriginal, XVID_PLG_AFTER, NULL, NULL, stats);
 		}
 		else
 			stats->type = XVID_TYPE_NOTHING;
@@ -1256,7 +1289,7 @@
 		SWAP(FRAMEINFO*, pEnc->current, pEnc->bframes[pEnc->bframenum_tail]);
 
 		if ((pEnc->current->vop_flags & XVID_VOP_DEBUG)) {
-			image_printf(&pEnc->current->image, pEnc->mbParam.edged_width, pEnc->mbParam.height, 5, 100, "DX50 BVOP->PVOP");
+			image_printf(&pEnc->current->image, pEnc->mbParam.edged_width, pEnc->mbParam.height, 5, 100, "CLOSED GOP BVOP->PVOP");
 		}
 
 		/* convert B-VOP quant to P-VOP */
@@ -1351,7 +1384,9 @@
 
 		if ( FrameCodeP(pEnc, &bs) == 0 ) {
 			/* N-VOP, we mustn't code b-frames yet */
-			call_plugins(pEnc, pEnc->current, &pEnc->sOriginal, XVID_PLG_AFTER, 0, 0, stats);
+			if ((pEnc->mbParam.global_flags & XVID_GLOBAL_PACKED) || 
+				 pEnc->mbParam.max_bframes == 0)
+				call_plugins(pEnc, pEnc->current, &pEnc->sOriginal, XVID_PLG_AFTER, NULL, NULL, stats);
 			goto done;
 		}
 	}
@@ -1372,7 +1407,7 @@
 
 	/* packed or no-bframes or no-bframes-queued: output stats */
 	if ((pEnc->mbParam.global_flags & XVID_GLOBAL_PACKED) || pEnc->mbParam.max_bframes == 0 ) {
-		call_plugins(pEnc, pEnc->current, &pEnc->sOriginal, XVID_PLG_AFTER, 0, 0, stats);
+		call_plugins(pEnc, pEnc->current, &pEnc->sOriginal, XVID_PLG_AFTER, NULL, NULL, stats);
 	}
 
 	/* %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -1461,6 +1496,7 @@
 	BitstreamWriteVopHeader(bs, &pEnc->mbParam, pEnc->current, 1, pEnc->current->mbs[0].quant);
 
 	pEnc->current->sStat.iTextBits = 0;
+	pEnc->current->sStat.iMVBits = 0;
 	pEnc->current->sStat.kblks = mb_width * mb_height;
 	pEnc->current->sStat.mblks = pEnc->current->sStat.ublks = 0;
 
@@ -1535,7 +1571,6 @@
 	DECLARE_ALIGNED_MATRIX(qcoeff, 6, 64, int16_t, CACHE_LINE);
 
 	int x, y, k;
-	int skip_possible;
 	FRAMEINFO *const current = pEnc->current;
 	FRAMEINFO *const reference = pEnc->reference;
 	MBParam * const pParam = &pEnc->mbParam;
@@ -1560,8 +1595,8 @@
 	if ((current->vop_flags & XVID_VOP_HALFPEL)) {
 		if (reference->is_interpolated != current->rounding_type) {
 			start_timer();
-			image_interpolate(pRef, &pEnc->vInterH, &pEnc->vInterV,
-							  &pEnc->vInterHV, pParam->edged_width,
+			image_interpolate(pRef->y, pEnc->vInterH.y, pEnc->vInterV.y,
+							  pEnc->vInterHV.y, pParam->edged_width,
 							  pParam->edged_height,
 							  (pParam->vol_flags & XVID_VOL_QUARTERPEL),
 							  current->rounding_type);
@@ -1571,7 +1606,8 @@
 	}
 
 	current->sStat.iTextBits = current->sStat.iMvSum = current->sStat.iMvCount =
-		current->sStat.kblks = current->sStat.mblks = current->sStat.ublks = 0;
+		current->sStat.kblks = current->sStat.mblks = current->sStat.ublks = 
+		current->sStat.iMVBits = 0;
 
 	current->coding_type = P_VOP;
 
@@ -1643,8 +1679,8 @@
 
 	for (y = 0; y < mb_height; y++) {
 		for (x = 0; x < mb_width; x++) {
-			MACROBLOCK *pMB =
-				&current->mbs[x + y * pParam->mb_width];
+			MACROBLOCK *pMB = &current->mbs[x + y * pParam->mb_width];
+			int skip_possible;
 
 			if (pMB->mode == MODE_INTRA || pMB->mode == MODE_INTRA_Q) {
 				CodeIntraMB(pEnc, pMB);
@@ -1698,101 +1734,57 @@
 
 			/* Finished processing the MB, now check if to CODE or SKIP */
 
-			skip_possible = (pMB->cbp == 0) && (pMB->mode == MODE_INTER) &&
-							(pMB->dquant == 0);
+			skip_possible = (pMB->cbp == 0) && (pMB->mode == MODE_INTER);
 
 			if (current->coding_type == S_VOP)
 				skip_possible &= (pMB->mcsel == 1);
-			else if (current->coding_type == P_VOP) {
-				if ((pParam->vol_flags & XVID_VOL_QUARTERPEL))
-					skip_possible &= ( (pMB->qmvs[0].x == 0) && (pMB->qmvs[0].y == 0) );
-				else
-					skip_possible &= ( (pMB->mvs[0].x == 0) && (pMB->mvs[0].y == 0) );
+			else { /* PVOP */
+				const VECTOR * const mv = (pParam->vol_flags & XVID_VOL_QUARTERPEL) ?
+										pMB->qmvs : pMB->mvs;
+				skip_possible &= ((mv->x|mv->y) == 0);
 			}
 
-			if ( (pMB->mode == MODE_NOT_CODED) || (skip_possible)) {
+			if ((pMB->mode == MODE_NOT_CODED) || (skip_possible)) {
+				/* This is a candidate for SKIPping, but for P-VOPs check intermediate B-frames first */
+				int bSkip = 1;
 
-/* This is a candidate for SKIPping, but for P-VOPs check intermediate B-frames first */
+				if (current->coding_type == P_VOP) {	/* special rule for P-VOP's SKIP */
 
-				if (current->coding_type == P_VOP)	/* special rule for P-VOP's SKIP */
-				{
-					int bSkip = 1;
-
-					for (k=pEnc->bframenum_head; k< pEnc->bframenum_tail; k++)
-					{
+					for (k = pEnc->bframenum_head; k < pEnc->bframenum_tail; k++) {
 						int iSAD;
 						iSAD = sad16(reference->image.y + 16*y*pParam->edged_width + 16*x,
-									pEnc->bframes[k]->image.y + 16*y*pParam->edged_width + 16*x,
-								pParam->edged_width,BFRAME_SKIP_THRESHHOLD);
-						if (iSAD >= BFRAME_SKIP_THRESHHOLD * pMB->quant)
-						{	bSkip = 0;
+										pEnc->bframes[k]->image.y + 16*y*pParam->edged_width + 16*x,
+										pParam->edged_width, BFRAME_SKIP_THRESHHOLD * pMB->quant);
+						if (iSAD >= BFRAME_SKIP_THRESHHOLD * pMB->quant) {
+							bSkip = 0; /* could not SKIP */
+							if (pParam->vol_flags & XVID_VOL_QUARTERPEL) {
+								VECTOR predMV = get_qpmv2(current->mbs, pParam->mb_width, 0, x, y, 0);
+								pMB->pmvs[0].x = - predMV.x;
+								pMB->pmvs[0].y = - predMV.y;
+							} else {
+								VECTOR predMV = get_pmv2(current->mbs, pParam->mb_width, 0, x, y, 0);
+								pMB->pmvs[0].x = - predMV.x;
+								pMB->pmvs[0].y = - predMV.y;
+							}
+							pMB->mode = MODE_INTER;
+							pMB->cbp = 0;
 							break;
 						}
 					}
-
-					if (!bSkip) {	/* no SKIP, but trivial block */
-						if((pParam->vol_flags & XVID_VOL_QUARTERPEL)) {
-							VECTOR predMV = get_qpmv2(current->mbs, pParam->mb_width, 0, x, y, 0);
-							pMB->pmvs[0].x = - predMV.x;
-							pMB->pmvs[0].y = - predMV.y;
-						}
-						else {
-							VECTOR predMV = get_pmv2(current->mbs, pParam->mb_width, 0, x, y, 0);
-							pMB->pmvs[0].x = - predMV.x;
-							pMB->pmvs[0].y = - predMV.y;
-						}
-						pMB->mode = MODE_INTER;
-						pMB->cbp = 0;
-						MBCoding(current, pMB, qcoeff, bs, &current->sStat);
-						stop_coding_timer();
-
-						continue;	/* next MB */
-					}
 				}
-				/* do SKIP */
-
-				pMB->mode = MODE_NOT_CODED;
-				MBSkip(bs);
-				stop_coding_timer();
-				continue;	/* next MB */
-			}
-			/* ordinary case: normal coded INTER/INTER4V block */
-
-			if((pParam->vol_flags & XVID_VOL_QUARTERPEL)) {
-				VECTOR predMV = get_qpmv2(current->mbs, pParam->mb_width, 0, x, y, 0);
-				pMB->pmvs[0].x = pMB->qmvs[0].x - predMV.x;
-				pMB->pmvs[0].y = pMB->qmvs[0].y - predMV.y;
-				DPRINTF(XVID_DEBUG_MV,"mv_diff (%i,%i) pred (%i,%i) result (%i,%i)\n", pMB->pmvs[0].x, pMB->pmvs[0].y, predMV.x, predMV.y, pMB->mvs[0].x, pMB->mvs[0].y);
-			} else {
-				VECTOR predMV = get_pmv2(current->mbs, pParam->mb_width, 0, x, y, 0);
-				pMB->pmvs[0].x = pMB->mvs[0].x - predMV.x;
-				pMB->pmvs[0].y = pMB->mvs[0].y - predMV.y;
-				DPRINTF(XVID_DEBUG_MV,"mv_diff (%i,%i) pred (%i,%i) result (%i,%i)\n", pMB->pmvs[0].x, pMB->pmvs[0].y, predMV.x, predMV.y, pMB->mvs[0].x, pMB->mvs[0].y);
-			}
-
-
-			if (pMB->mode == MODE_INTER4V)
-			{	int k;
-				for (k=1;k<4;k++)
-				{
-					if((pParam->vol_flags & XVID_VOL_QUARTERPEL)) {
-						VECTOR predMV = get_qpmv2(current->mbs, pParam->mb_width, 0, x, y, k);
-						pMB->pmvs[k].x = pMB->qmvs[k].x - predMV.x;
-						pMB->pmvs[k].y = pMB->qmvs[k].y - predMV.y;
-				DPRINTF(XVID_DEBUG_MV,"mv_diff (%i,%i) pred (%i,%i) result (%i,%i)\n", pMB->pmvs[k].x, pMB->pmvs[k].y, predMV.x, predMV.y, pMB->mvs[k].x, pMB->mvs[k].y);
-					} else {
-						VECTOR predMV = get_pmv2(current->mbs, pParam->mb_width, 0, x, y, k);
-						pMB->pmvs[k].x = pMB->mvs[k].x - predMV.x;
-						pMB->pmvs[k].y = pMB->mvs[k].y - predMV.y;
-				DPRINTF(XVID_DEBUG_MV,"mv_diff (%i,%i) pred (%i,%i) result (%i,%i)\n", pMB->pmvs[k].x, pMB->pmvs[k].y, predMV.x, predMV.y, pMB->mvs[k].x, pMB->mvs[k].y);
-					}
 
+				if (bSkip) {
+					/* do SKIP */
+					pMB->mode = MODE_NOT_CODED;
+					MBSkip(bs);
+					stop_coding_timer();
+					continue;	/* next MB */
 				}
 			}
 
+			/* ordinary case: normal coded INTER/INTER4V block */
 			MBCoding(current, pMB, qcoeff, bs, &pEnc->current->sStat);
 			stop_coding_timer();
-
 		}
 	}
 
@@ -1807,7 +1799,7 @@
 		(pParam->frame_drop_ratio * mb_width * mb_height) / 100 &&
 		( (pEnc->bframenum_head >= pEnc->bframenum_tail) || !(pEnc->mbParam.global_flags & XVID_GLOBAL_CLOSED_GOP)) )
 	{
-		current->sStat.kblks = current->sStat.mblks = 0;
+		current->sStat.kblks = current->sStat.mblks = current->sStat.iTextBits = 0;
 		current->sStat.ublks = mb_width * mb_height;
 
 		BitstreamReset(bs);
@@ -1897,7 +1889,7 @@
 
 	if (pEnc->reference->is_interpolated != 0) {
 		start_timer();
-		image_interpolate(f_ref, &pEnc->f_refh, &pEnc->f_refv, &pEnc->f_refhv,
+		image_interpolate(f_ref->y, pEnc->f_refh.y, pEnc->f_refv.y, pEnc->f_refhv.y,
 						  pEnc->mbParam.edged_width, pEnc->mbParam.edged_height,
 						  (pEnc->mbParam.vol_flags & XVID_VOL_QUARTERPEL), 0);
 		stop_inter_timer();
@@ -1914,7 +1906,7 @@
 
 	if (pEnc->current->is_interpolated != 0) {
 		start_timer();
-		image_interpolate(b_ref, &pEnc->vInterH, &pEnc->vInterV, &pEnc->vInterHV,
+		image_interpolate(b_ref->y, pEnc->vInterH.y, pEnc->vInterV.y, pEnc->vInterHV.y,
 						pEnc->mbParam.edged_width, pEnc->mbParam.edged_height,
 						(pEnc->mbParam.vol_flags & XVID_VOL_QUARTERPEL), 0);
 		stop_inter_timer();
@@ -1922,7 +1914,7 @@
 	}
 
 	frame->coding_type = B_VOP;
-	call_plugins(pEnc, pEnc->current, NULL, XVID_PLG_FRAME, NULL, NULL, NULL);
+	call_plugins(pEnc, frame, NULL, XVID_PLG_FRAME, NULL, NULL, NULL);
 
 	start_timer();
 	MotionEstimationBVOP(&pEnc->mbParam, frame,
@@ -1938,6 +1930,7 @@
 	BitstreamWriteVopHeader(bs, &pEnc->mbParam, frame, 1, frame->quant);
 
 	frame->sStat.iTextBits = 0;
+	frame->sStat.iMVBits = 0;
 	frame->sStat.iMvSum = 0;
 	frame->sStat.iMvCount = 0;
 	frame->sStat.kblks = frame->sStat.mblks = frame->sStat.ublks = 0;