--- encoder.c	2003/11/20 12:07:19	1.95.2.55
+++ encoder.c	2004/12/08 12:43:48	1.111
@@ -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.95.2.55 2003/11/20 12:07:19 syskin Exp $
+ * $Id: encoder.c,v 1.111 2004/12/08 12:43:48 syskin Exp $
  *
  ****************************************************************************/
 
@@ -57,9 +57,7 @@
 					  Bitstream * bs);
 
 static int FrameCodeP(Encoder * pEnc,
-					  Bitstream * bs,
-					  bool force_inter,
-					  bool vol_header);
+					  Bitstream * bs);
 
 static void FrameCodeB(Encoder * pEnc,
 					   FRAMEINFO * frame,
@@ -102,11 +100,22 @@
 		i--;
 	}
 
-	/* if neccessary, round to 65535 accuracy */
-	if (*base > 65535) {
-		float div = (float) *base / 65535;
-		*base = (int) (*base / div);
-		*inc = (int) (*inc / div);
+	if (*base > 65535 || *inc > 65535) {
+		int *biggest;
+		int *other;
+		float div;
+
+		if (*base > *inc) {
+			biggest = base;
+			other = inc;
+		} else {
+			biggest = inc;
+			other = base;
+		}
+		
+		div = ((float)*biggest)/((float)65535);
+		*biggest = (int)(((float)*biggest)/div);
+		*other = (int)(((float)*other)/div);
 	}
 }
 
@@ -123,6 +132,9 @@
 	if (create->width%2 || create->height%2)
 		return XVID_ERR_FAIL;
 
+	if (create->width<=0 || create->height<=0)
+		return XVID_ERR_FAIL;
+
 	/* allocate encoder struct */
 
 	pEnc = (Encoder *) xvid_malloc(sizeof(Encoder), CACHE_LINE);
@@ -250,6 +262,14 @@
 	if (pEnc->current->mbs == NULL || pEnc->reference->mbs == NULL)
 		goto xvid_err_memory2;
 
+	/* allocate quant matrix memory */
+
+	pEnc->mbParam.mpeg_quant_matrices =
+		xvid_malloc(sizeof(uint16_t) * 64 * 8, CACHE_LINE);
+
+	if (pEnc->mbParam.mpeg_quant_matrices == NULL)
+		goto xvid_err_memory2a;
+
 	/* allocate interpolation image memory */
 
 	if ((pEnc->mbParam.plugin_flags & XVID_REQORIGINAL)) {
@@ -403,6 +423,7 @@
 	create->handle = (void *) pEnc;
 
 	init_timer();
+	init_mpeg_matrix(pEnc->mbParam.mpeg_quant_matrices);
 
 	return 0;   /* ok */
 
@@ -469,6 +490,8 @@
 	image_destroy(&pEnc->vGMC, pEnc->mbParam.edged_width,
 				  pEnc->mbParam.edged_height);
 
+  xvid_err_memory2a:
+	xvid_free(pEnc->mbParam.mpeg_quant_matrices);
 
   xvid_err_memory2:
 	xvid_free(pEnc->current->mbs);
@@ -597,6 +620,8 @@
 		xvid_free(pEnc->plugins);
 	}
 
+	xvid_free(pEnc->mbParam.mpeg_quant_matrices);
+
 	if (pEnc->num_plugins>0)
 		xvid_free(pEnc->zones);
 
@@ -639,7 +664,7 @@
 		data.max_quant[i] = pEnc->mbParam.max_quant[i];
 	}
 
-	data.reference.csp = XVID_CSP_USER;
+	data.reference.csp = XVID_CSP_PLANAR;
 	data.reference.plane[0] = pEnc->reference->image.y;
 	data.reference.plane[1] = pEnc->reference->image.u;
 	data.reference.plane[2] = pEnc->reference->image.v;
@@ -647,7 +672,7 @@
 	data.reference.stride[1] = pEnc->mbParam.edged_width/2;
 	data.reference.stride[2] = pEnc->mbParam.edged_width/2;
 
-	data.current.csp = XVID_CSP_USER;
+	data.current.csp = XVID_CSP_PLANAR;
 	data.current.plane[0] = frame->image.y;
 	data.current.plane[1] = frame->image.u;
 	data.current.plane[2] = frame->image.v;
@@ -677,7 +702,7 @@
 	
 	} else { /* XVID_PLG_AFTER */
 		if ((pEnc->mbParam.plugin_flags & XVID_REQORIGINAL)) {
-			data.original.csp = XVID_CSP_USER;
+			data.original.csp = XVID_CSP_PLANAR;
 			data.original.plane[0] = original->y;
 			data.original.plane[1] = original->u;
 			data.original.plane[2] = original->v;
@@ -727,20 +752,22 @@
 		data.mblks = frame->sStat.mblks;
 		data.ublks = frame->sStat.ublks;
 
-		if (stats) {
-			stats->type = coding2type(frame->coding_type);
-			stats->quant = frame->quant;
-			stats->vol_flags = frame->vol_flags;
-			stats->vop_flags = frame->vop_flags;
-			stats->length = frame->length;
-			stats->hlength = frame->length - (frame->sStat.iTextBits / 8);
-			stats->kblks = frame->sStat.kblks;
-			stats->mblks = frame->sStat.mblks;
-			stats->ublks = frame->sStat.ublks;
-			stats->sse_y = data.sse_y;
-			stats->sse_u = data.sse_u;
-			stats->sse_v = data.sse_v;
-		}
+		/* New code */
+		data.stats.type      = coding2type(frame->coding_type);
+		data.stats.quant     = frame->quant;
+		data.stats.vol_flags = frame->vol_flags;
+		data.stats.vop_flags = frame->vop_flags;
+		data.stats.length    = frame->length;
+		data.stats.hlength   = frame->length - (frame->sStat.iTextBits / 8);
+		data.stats.kblks     = frame->sStat.kblks;
+		data.stats.mblks     = frame->sStat.mblks;
+		data.stats.ublks     = frame->sStat.ublks;
+		data.stats.sse_y     = data.sse_y;
+		data.stats.sse_u     = data.sse_u;
+		data.stats.sse_v     = data.sse_v;
+
+		if (stats)
+			*stats = data.stats;
 	}
 
 	/* call plugins */
@@ -833,20 +860,65 @@
 {
 
 	pCur->ticks = (int32_t)pCur->stamp % time_base;
-		pCur->seconds =  ((int32_t)pCur->stamp / time_base)	- ((int32_t)pRef->stamp / time_base) ;
-
-		/* HEAVY DEBUG OUTPUT remove when timecodes prove to be stable */
+	pCur->seconds =  ((int32_t)pCur->stamp / time_base)	- ((int32_t)pRef->stamp / time_base) ;
 
-/*		fprintf(stderr,"WriteVop:   %d - %d \n",
+#if 0 	/* HEAVY DEBUG OUTPUT */
+	fprintf(stderr,"WriteVop:   %d - %d \n",
 			((int32_t)pCur->stamp / time_base), ((int32_t)pRef->stamp / time_base));
-		fprintf(stderr,"set_timecodes: VOP %1d   stamp=%lld ref_stamp=%lld  base=%d\n",
+	fprintf(stderr,"set_timecodes: VOP %1d   stamp=%lld ref_stamp=%lld  base=%d\n",
 			pCur->coding_type, pCur->stamp, pRef->stamp, time_base);
-		fprintf(stderr,"set_timecodes: VOP %1d   seconds=%d   ticks=%d   (ref-sec=%d  ref-tick=%d)\n",
+	fprintf(stderr,"set_timecodes: VOP %1d   seconds=%d   ticks=%d   (ref-sec=%d  ref-tick=%d)\n",
 			pCur->coding_type, pCur->seconds, pCur->ticks, pRef->seconds, pRef->ticks);
+#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)
+{
+
+	int _par_width  = (!*par_width)  ? 1 : (*par_width<0)  ? -*par_width:  *par_width;
+	int _par_height = (!*par_height) ? 1 : (*par_height<0) ? -*par_height: *par_height;
+	int divisor = gcd(_par_width, _par_height);
+
+	_par_width  /= divisor;
+	_par_height /= divisor;
+
+	/* 2^8 precision maximum */
+	if (_par_width>255 || _par_height>255) {
+		float div;
+		emms();
+		if (_par_width>_par_height)
+			div = (float)_par_width/255;
+		else
+			div = (float)_par_height/255;
+
+		_par_width  = (int)((float)_par_width/div);
+		_par_height = (int)((float)_par_height/div);
+	}
+
+	*par_width = _par_width;
+	*par_height = _par_height;
+
+	return;
+}
 
 
 /*****************************************************************************
@@ -1026,8 +1098,9 @@
 				DPRINTF(XVID_DEBUG_DEBUG,"*** PFRAME bf: head=%i tail=%i   queue: head=%i tail=%i size=%i\n",
 				pEnc->bframenum_head, pEnc->bframenum_tail,
 				pEnc->queue_head, pEnc->queue_tail, pEnc->queue_size);
+				pEnc->mbParam.frame_drop_ratio = -1; /* it must be a coded vop */
 
-				FrameCodeP(pEnc, &bs, 1, 0);
+				FrameCodeP(pEnc, &bs);
 
 
 				if ((pEnc->mbParam.global_flags & XVID_GLOBAL_PACKED) && pEnc->bframenum_tail==0) {
@@ -1061,7 +1134,7 @@
 
 	pEnc->current->fincr = pEnc->mbParam.fincr>0 ? pEnc->mbParam.fincr : frame->fincr;
 	inc_frame_num(pEnc);
-	pEnc->current->vol_flags = pEnc->mbParam.vol_flags;
+	pEnc->current->vol_flags = frame->vol_flags;
 	pEnc->current->vop_flags = frame->vop_flags;
 	pEnc->current->motion_flags = frame->motion;
 	pEnc->current->fcode = pEnc->mbParam.m_fcode;
@@ -1096,6 +1169,9 @@
 		}
 	}
 
+	if (type != I_VOP) 
+		pEnc->current->vol_flags = pEnc->mbParam.vol_flags; /* don't allow VOL changes here */
+
 	/* bframes buffer overflow check */
 	if (type == B_VOP && pEnc->bframenum_tail >= pEnc->mbParam.max_bframes) {
 		type = P_VOP;
@@ -1208,7 +1284,9 @@
 		pEnc->iFrameNum = 1;
 
 		/* ---- update vol flags at IVOP ----------- */
-		pEnc->current->vol_flags = pEnc->mbParam.vol_flags = frame->vol_flags;
+		pEnc->mbParam.vol_flags = pEnc->current->vol_flags;
+
+		/* Aspect ratio */
 		switch(frame->par) {
 		case XVID_PAR_11_VGA:
 		case XVID_PAR_43_PAL:
@@ -1219,24 +1297,26 @@
 			pEnc->mbParam.par = frame->par;
 			break;
 		default:
-			pEnc->mbParam.par = XVID_PAR_EXT;
+			pEnc->mbParam.par = XVID_PAR_11_VGA;
 			break;
 		}
-		pEnc->mbParam.par_width = (frame->par_width)?frame->par_width:1;
-		pEnc->mbParam.par_height = (frame->par_height)?frame->par_height:1;
+
+		/* For extended PAR only, we try to sanityse/simplify par values */
+		if (pEnc->mbParam.par == XVID_PAR_EXT) {
+			pEnc->mbParam.par_width  = frame->par_width;
+			pEnc->mbParam.par_height = frame->par_height;
+			simplify_par(&pEnc->mbParam.par_width, &pEnc->mbParam.par_height);
+		}
 
 		if ((pEnc->mbParam.vol_flags & XVID_VOL_MPEGQUANT)) {
 			if (frame->quant_intra_matrix != NULL)
-				set_intra_matrix(frame->quant_intra_matrix);
+				set_intra_matrix(pEnc->mbParam.mpeg_quant_matrices, frame->quant_intra_matrix);
 			if (frame->quant_inter_matrix != NULL)
-				set_inter_matrix(frame->quant_inter_matrix);
+				set_inter_matrix(pEnc->mbParam.mpeg_quant_matrices, frame->quant_inter_matrix);
 		}
 
 		/* prevent vol/vop misuse */
 
-		if (!(pEnc->current->vol_flags & XVID_VOL_REDUCED_ENABLE))
-			pEnc->current->vop_flags &= ~XVID_VOP_REDUCED;
-
 		if (!(pEnc->current->vol_flags & XVID_VOL_INTERLACING))
 			pEnc->current->vop_flags &= ~(XVID_VOP_TOPFIELDFIRST|XVID_VOP_ALTERNATESCAN);
 
@@ -1269,7 +1349,11 @@
 				   pEnc->mbParam.edged_width, pEnc->mbParam.height);
 		}
 
-		FrameCodeP(pEnc, &bs, 1, 0);
+		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);
+			goto done;
+		}
 	}
 
 
@@ -1360,20 +1444,6 @@
 
 	uint16_t x, y;
 
-	if ((pEnc->current->vol_flags & XVID_VOL_REDUCED_ENABLE))
-	{
-		mb_width = (pEnc->mbParam.width + 31) / 32;
-		mb_height = (pEnc->mbParam.height + 31) / 32;
-
-		/* 16x16->8x8 downsample requires 1 additional edge pixel*/
-		/* XXX: setedges is overkill */
-		start_timer();
-		image_setedges(&pEnc->current->image,
-			pEnc->mbParam.edged_width, pEnc->mbParam.edged_height,
-			pEnc->mbParam.width, pEnc->mbParam.height);
-		stop_edges_timer();
-	}
-
 	pEnc->mbParam.m_rounding_type = 1;
 	pEnc->current->rounding_type = pEnc->mbParam.m_rounding_type;
 	pEnc->current->coding_type = I_VOP;
@@ -1382,7 +1452,7 @@
 
 	SetMacroblockQuants(&pEnc->mbParam, pEnc->current);
 
-	BitstreamWriteVolHeader(bs, &pEnc->mbParam);
+	BitstreamWriteVolHeader(bs, &pEnc->mbParam, pEnc->current);
 
 	set_timecodes(pEnc->current,pEnc->reference,pEnc->mbParam.fbase);
 
@@ -1418,12 +1488,6 @@
 			stop_coding_timer();
 		}
 
-	if ((pEnc->current->vop_flags & XVID_VOP_REDUCED))
-	{
-		image_deblock_rrv(&pEnc->current->image, pEnc->mbParam.edged_width,
-			pEnc->current->mbs, mb_width, mb_height, pEnc->mbParam.mb_width,
-			16, 0);
-	}
 	emms();
 
 	BitstreamPadAlways(bs); /* next_start_code() at the end of VideoObjectPlane() */
@@ -1447,9 +1511,7 @@
 /* FrameCodeP also handles S(GMC)-VOPs */
 static int
 FrameCodeP(Encoder * pEnc,
-		   Bitstream * bs,
-		   bool force_inter,
-		   bool vol_header)
+		   Bitstream * bs)
 {
 	float fSigma;
 	int bits = BitstreamPos(bs);
@@ -1457,31 +1519,24 @@
 	DECLARE_ALIGNED_MATRIX(dct_codes, 6, 64, int16_t, CACHE_LINE);
 	DECLARE_ALIGNED_MATRIX(qcoeff, 6, 64, int16_t, CACHE_LINE);
 
-	int iLimit;
 	int x, y, k;
 	int iSearchRange;
-	int bIntra=0, skip_possible;
+	int skip_possible;
 	FRAMEINFO *const current = pEnc->current;
 	FRAMEINFO *const reference = pEnc->reference;
 	MBParam * const pParam = &pEnc->mbParam;
 	int mb_width = pParam->mb_width;
 	int mb_height = pParam->mb_height;
+	int coded = 1;
 
 
 	/* IMAGE *pCurrent = &current->image; */
 	IMAGE *pRef = &reference->image;
 
-	if ((current->vop_flags & XVID_VOP_REDUCED))
-	{
-		mb_width = (pParam->width + 31) / 32;
-		mb_height = (pParam->height + 31) / 32;
-	}
-
-
 	if (!reference->is_edged) {	
 		start_timer();
 		image_setedges(pRef, pParam->edged_width, pParam->edged_height,
-					   pParam->width, pParam->height);
+					   pParam->width, pParam->height, 0);
 		stop_edges_timer();
 		reference->is_edged = 1;
 	}
@@ -1490,11 +1545,6 @@
 	current->rounding_type = pParam->m_rounding_type;
 	current->fcode = pParam->m_fcode;
 
-	if (!force_inter)
-		iLimit = (int)(mb_width * mb_height *  INTRA_THRESHOLD);
-	else
-		iLimit = mb_width * mb_height + 1;
-
 	if ((current->vop_flags & XVID_VOP_HALFPEL)) {
 		if (reference->is_interpolated != current->rounding_type) {
 			start_timer();
@@ -1508,6 +1558,9 @@
 		}
 	}
 
+	current->sStat.iTextBits = current->sStat.iMvSum = current->sStat.iMvCount =
+		current->sStat.kblks = current->sStat.mblks = current->sStat.ublks = 0;
+
 	current->coding_type = P_VOP;
 
 	call_plugins(pEnc, pEnc->current, NULL, XVID_PLG_FRAME, NULL, NULL, NULL);
@@ -1565,34 +1618,23 @@
 		}
 	}
 
-	bIntra =
-		MotionEstimation(&pEnc->mbParam, current, reference,
+	MotionEstimation(&pEnc->mbParam, current, reference,
 					 &pEnc->vInterH, &pEnc->vInterV, &pEnc->vInterHV,
-					 &pEnc->vGMC, iLimit);
+					 &pEnc->vGMC, 256*4096);
 
 
 	stop_motion_timer();
 
-	if (bIntra == 1) return FrameCodeI(pEnc, bs);
-
 	set_timecodes(current,reference,pParam->fbase);
-	if (vol_header)
-	{	BitstreamWriteVolHeader(bs, &pEnc->mbParam);
-		BitstreamPad(bs);
-	}
 
 	BitstreamWriteVopHeader(bs, &pEnc->mbParam, current, 1, current->mbs[0].quant);
 
-	current->sStat.iTextBits = current->sStat.iMvSum = current->sStat.iMvCount =
-		current->sStat.kblks = current->sStat.mblks = current->sStat.ublks = 0;
-
-
 	for (y = 0; y < mb_height; y++) {
 		for (x = 0; x < mb_width; x++) {
 			MACROBLOCK *pMB =
 				&current->mbs[x + y * pParam->mb_width];
 
-			bIntra = (pMB->mode == MODE_INTRA) || (pMB->mode == MODE_INTRA_Q);
+			int bIntra = (pMB->mode == MODE_INTRA) || (pMB->mode == MODE_INTRA_Q);
 
 			if (bIntra) {
 				CodeIntraMB(pEnc, pMB);
@@ -1624,7 +1666,6 @@
 								 pParam->height,
 								 pParam->edged_width,
 								 (current->vol_flags & XVID_VOL_QUARTERPEL),
-								 (current->vop_flags & XVID_VOP_REDUCED),
 								 current->rounding_type);
 
 			stop_comp_timer();
@@ -1757,13 +1798,6 @@
 		}
 	}
 
-	if ((current->vop_flags & XVID_VOP_REDUCED))
-	{
-		image_deblock_rrv(&current->image, pParam->edged_width,
-			current->mbs, mb_width, mb_height, pParam->mb_width,
-			16, 0);
-	}
-
 	emms();
 
 	if (current->sStat.iMvCount == 0)
@@ -1771,21 +1805,15 @@
 
 	fSigma = (float) sqrt((float) current->sStat.iMvSum / current->sStat.iMvCount);
 
-	iSearchRange = 1 << (3 + pParam->m_fcode);
+	iSearchRange = 16 << pParam->m_fcode;
 
-	if ((fSigma > iSearchRange / 3)
-		&& (pParam->m_fcode <= (3 +  (pParam->vol_flags & XVID_VOL_QUARTERPEL?1:0)  )))	/* maximum search range 128 */
-	{
+	if ((3.0 * fSigma > iSearchRange) && (pParam->m_fcode <= 5) )
 		pParam->m_fcode++;
-		iSearchRange *= 2;
-	} else if ((fSigma < iSearchRange / 6)
-			   && (pEnc->fMvPrevSigma >= 0)
-			   && (pEnc->fMvPrevSigma < iSearchRange / 6)
-			   && (pParam->m_fcode >= (2 + (pParam->vol_flags & XVID_VOL_QUARTERPEL?1:0) )))	/* minimum search range 16 */
-	{
+
+	else if ((5.0 * fSigma < iSearchRange)
+			   && (4.0 * pEnc->fMvPrevSigma < iSearchRange)
+			   && (pParam->m_fcode >= 2) )	/* minimum search range 32 */
 		pParam->m_fcode--;
-		iSearchRange /= 2;
-	}
 
 	pEnc->fMvPrevSigma = fSigma;
 
@@ -1793,8 +1821,9 @@
 #if 0
 	DPRINTF(XVID_DEBUG_DEBUG, "kmu %i %i %i\n", current->sStat.kblks, current->sStat.mblks, current->sStat.ublks);
 #endif
-	if (current->sStat.kblks + current->sStat.mblks <
-		(pParam->frame_drop_ratio * mb_width * mb_height) / 100)
+	if (current->sStat.kblks + current->sStat.mblks <=
+		(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.ublks = mb_width * mb_height;
@@ -1810,20 +1839,23 @@
 		current->rounding_type = reference->rounding_type;
 		current->fcode = reference->fcode;
 		current->bcode = reference->bcode;
+		current->stamp = reference->stamp;
 		image_copy(&current->image, &reference->image, pParam->edged_width, pParam->height);
 		memcpy(current->mbs, reference->mbs, sizeof(MACROBLOCK) * mb_width * mb_height);
-	}
-
-	pEnc->current->is_edged = 0; /* not edged */
-	pEnc->current->is_interpolated = -1; /* not interpolated (fake rounding -1) */
+		coded = 0;
+	
+	} else {
 
-	/* what was this frame's interpolated reference will become 
-		forward (past) reference in b-frame coding */
+		pEnc->current->is_edged = 0; /* not edged */
+		pEnc->current->is_interpolated = -1; /* not interpolated (fake rounding -1) */
 
-	image_swap(&pEnc->vInterH, &pEnc->f_refh);
-	image_swap(&pEnc->vInterV, &pEnc->f_refv);
-	image_swap(&pEnc->vInterHV, &pEnc->f_refhv);
+		/* what was this frame's interpolated reference will become 
+			forward (past) reference in b-frame coding */
 
+		image_swap(&pEnc->vInterH, &pEnc->f_refh);
+		image_swap(&pEnc->vInterV, &pEnc->f_refv);
+		image_swap(&pEnc->vInterHV, &pEnc->f_refhv);
+	}
 
 	/* XXX: debug
 	{
@@ -1844,7 +1876,7 @@
 
 	current->length = (BitstreamPos(bs) - bits) / 8;
 
-	return 0;					/* inter */
+	return coded;
 }
 
 
@@ -1868,8 +1900,6 @@
 		fprintf(fp,"Y=%3d   X=%3d   MB=%2d   CBP=%02X\n",y,x,mb->mode,mb->cbp); \
 	}
 
-	/* XXX: pEnc->current->global_flags &= ~XVID_VOP_REDUCED;  reduced resoltion not yet supported */
-
 	if (!first){
 		fp=fopen("C:\\XVIDDBGE.TXT","w");
 	}
@@ -1879,7 +1909,7 @@
 	if (!pEnc->reference->is_edged) {
 		image_setedges(f_ref, pEnc->mbParam.edged_width,
 					   pEnc->mbParam.edged_height, pEnc->mbParam.width,
-					   pEnc->mbParam.height);
+					   pEnc->mbParam.height, 0);
 		pEnc->current->is_edged = 1;	
 	}
 
@@ -1896,7 +1926,7 @@
 	if (!pEnc->current->is_edged) {
 		image_setedges(b_ref, pEnc->mbParam.edged_width,
 					   pEnc->mbParam.edged_height, pEnc->mbParam.width,
-					   pEnc->mbParam.height);
+					   pEnc->mbParam.height, 0);
 		pEnc->current->is_edged = 1;
 	}
 
@@ -1940,7 +1970,7 @@
 			if (mb->mode == MODE_NOT_CODED) {
 				if (pEnc->mbParam.plugin_flags & XVID_REQORIGINAL) {
 					MBMotionCompensation(mb, x, y, f_ref, NULL, f_ref, NULL, NULL, &frame->image,
-											NULL, 0, 0, pEnc->mbParam.edged_width, 0, 0, 0);
+											NULL, 0, 0, pEnc->mbParam.edged_width, 0, 0);
 				}
 
 				continue;