--- trunk/xvidcore/src/encoder.c	2002/03/09 21:44:47	20
+++ trunk/xvidcore/src/encoder.c	2002/04/13 16:30:02	118
@@ -1,3 +1,5 @@
+// 14.04.2002	added FrameCodeB()
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <math.h>
@@ -16,6 +18,7 @@
 #include "bitstream/mbcoding.h"
 #include "quant/adapt_quant.h"
 #include "quant/quant_matrix.h"
+#include "utils/mem_align.h"
 
 #define ENC_CHECK(X) if(!(X)) return XVID_ERR_FORMAT
 
@@ -81,7 +84,7 @@
 		pParam->bitrate = 900000;
 
 	if (pParam->rc_buffersize <= 0)
-		pParam->rc_buffersize = pParam->bitrate * pParam->fbase;
+		pParam->rc_buffersize = 16;
 
 	if ((pParam->min_quantizer <= 0) || (pParam->min_quantizer > 31))
 		pParam->min_quantizer = 1;
@@ -95,7 +98,7 @@
 	if (pParam->max_quantizer < pParam->min_quantizer)
 		pParam->max_quantizer = pParam->min_quantizer;
 
-	if ((pEnc = (Encoder *) malloc(sizeof(Encoder))) == NULL)
+	if ((pEnc = (Encoder *) xvid_malloc(sizeof(Encoder), CACHE_LINE)) == NULL)
 		return XVID_ERR_MEMORY;
 
 	/* Fill members of Encoder structure */
@@ -120,55 +123,44 @@
 	pEnc->iFrameNum = 0;
 	pEnc->iMaxKeyInterval = pParam->max_key_interval;
 
-	if (image_create(&pEnc->sCurrent, pEnc->mbParam.edged_width, pEnc->mbParam.edged_height) < 0)
-	{
-		free(pEnc);
-		return XVID_ERR_MEMORY;
-	}
-
-	if (image_create(&pEnc->sReference, pEnc->mbParam.edged_width, pEnc->mbParam.edged_height) < 0)
-	{
-		image_destroy(&pEnc->sCurrent, pEnc->mbParam.edged_width, pEnc->mbParam.edged_height);
-		free(pEnc);
-		return XVID_ERR_MEMORY;
-	}
-
-	if (image_create(&pEnc->vInterH, pEnc->mbParam.edged_width, pEnc->mbParam.edged_height) < 0)
-	{
-		image_destroy(&pEnc->sCurrent, pEnc->mbParam.edged_width, pEnc->mbParam.edged_height);
-		image_destroy(&pEnc->sReference, pEnc->mbParam.edged_width, pEnc->mbParam.edged_height);
-		free(pEnc);
-		return XVID_ERR_MEMORY;
-	}
-
-	if (image_create(&pEnc->vInterV, pEnc->mbParam.edged_width, pEnc->mbParam.edged_height) < 0)
-	{
-		image_destroy(&pEnc->sCurrent, pEnc->mbParam.edged_width, pEnc->mbParam.edged_height);
-		image_destroy(&pEnc->sReference, pEnc->mbParam.edged_width, pEnc->mbParam.edged_height);
-		image_destroy(&pEnc->vInterH, pEnc->mbParam.edged_width, pEnc->mbParam.edged_height);
-		free(pEnc);
-		return XVID_ERR_MEMORY;
-	}
-
-	if (image_create(&pEnc->vInterHV, pEnc->mbParam.edged_width, pEnc->mbParam.edged_height) < 0)
-	{
-		image_destroy(&pEnc->sCurrent, pEnc->mbParam.edged_width, pEnc->mbParam.edged_height);
-		image_destroy(&pEnc->sReference, pEnc->mbParam.edged_width, pEnc->mbParam.edged_height);
-		image_destroy(&pEnc->vInterH, pEnc->mbParam.edged_width, pEnc->mbParam.edged_height);
-		image_destroy(&pEnc->vInterV, pEnc->mbParam.edged_width, pEnc->mbParam.edged_height);
-		free(pEnc);
-		return XVID_ERR_MEMORY;
-	}
+	/* try to allocate memory */
 
-	pEnc->pMBs = malloc(sizeof(MACROBLOCK) * pEnc->mbParam.mb_width * pEnc->mbParam.mb_height);
-	if (pEnc->pMBs == NULL)
+	pEnc->sCurrent.y	=	pEnc->sCurrent.u	=	pEnc->sCurrent.v	= NULL;
+	pEnc->sReference.y	=	pEnc->sReference.u	=	pEnc->sReference.v	= NULL;
+	pEnc->vInterH.y		=	pEnc->vInterH.u		=	pEnc->vInterH.v		= NULL;
+	pEnc->vInterV.y		=	pEnc->vInterV.u		=	pEnc->vInterV.v		= NULL;
+	pEnc->vInterVf.y	=	pEnc->vInterVf.u	=	pEnc->vInterVf.v	= NULL;
+	pEnc->vInterHV.y	=	pEnc->vInterHV.u	=	pEnc->vInterHV.v	= NULL;
+	pEnc->vInterHVf.y	=	pEnc->vInterHVf.u	=	pEnc->vInterHVf.v	= NULL;
+
+	pEnc->pMBs = NULL;
+
+	if (image_create(&pEnc->sCurrent, pEnc->mbParam.edged_width, pEnc->mbParam.edged_height) < 0 ||
+		image_create(&pEnc->sReference, pEnc->mbParam.edged_width, pEnc->mbParam.edged_height) < 0 ||
+		image_create(&pEnc->vInterH, pEnc->mbParam.edged_width, pEnc->mbParam.edged_height) < 0 ||
+		image_create(&pEnc->vInterV, pEnc->mbParam.edged_width, pEnc->mbParam.edged_height) < 0 ||
+		image_create(&pEnc->vInterVf, pEnc->mbParam.edged_width, pEnc->mbParam.edged_height) < 0 ||
+		image_create(&pEnc->vInterHV, pEnc->mbParam.edged_width, pEnc->mbParam.edged_height) < 0 ||
+		image_create(&pEnc->vInterHVf, pEnc->mbParam.edged_width, pEnc->mbParam.edged_height) < 0 ||
+#ifdef _DEBUG
+		image_create(&pEnc->sOriginal, pEnc->mbParam.edged_width, pEnc->mbParam.edged_height) < 0 ||
+#endif
+		(pEnc->pMBs = xvid_malloc(sizeof(MACROBLOCK) * pEnc->mbParam.mb_width * pEnc->mbParam.mb_height, CACHE_LINE)) == NULL)
 	{
 		image_destroy(&pEnc->sCurrent, pEnc->mbParam.edged_width, pEnc->mbParam.edged_height);
 		image_destroy(&pEnc->sReference, pEnc->mbParam.edged_width, pEnc->mbParam.edged_height);
 		image_destroy(&pEnc->vInterH, pEnc->mbParam.edged_width, pEnc->mbParam.edged_height);
 		image_destroy(&pEnc->vInterV, pEnc->mbParam.edged_width, pEnc->mbParam.edged_height);
+		image_destroy(&pEnc->vInterVf, pEnc->mbParam.edged_width, pEnc->mbParam.edged_height);
 		image_destroy(&pEnc->vInterHV, pEnc->mbParam.edged_width, pEnc->mbParam.edged_height);
-		free(pEnc);
+		image_destroy(&pEnc->vInterHVf, pEnc->mbParam.edged_width, pEnc->mbParam.edged_height);
+#ifdef _DEBUG
+		image_destroy(&pEnc->sOriginal, pEnc->mbParam.edged_width, pEnc->mbParam.edged_height);
+#endif
+		if (pEnc)
+		{
+			xvid_free(pEnc);
+		}
 		return XVID_ERR_MEMORY;
 	}
 
@@ -182,11 +174,11 @@
 
 	if (pParam->bitrate)
 	{
-		RateControlInit(pParam->bitrate, pParam->rc_buffersize, pParam->fbase, pParam->width,
-				pParam->height, pParam->max_quantizer, pParam->min_quantizer);
+		RateControlInit(pParam->bitrate, pParam->rc_buffersize, pParam->fbase * 1000 / pParam->fincr,
+				pParam->max_quantizer, pParam->min_quantizer);
 	}
 
-	create_vlc_tables();
+	init_timer();
 
 	return XVID_ERR_OK;
 }
@@ -198,15 +190,18 @@
 	ENC_CHECK(pEnc->sCurrent.y);
 	ENC_CHECK(pEnc->sReference.y);
 
-	free(pEnc->pMBs);
+	xvid_free(pEnc->pMBs);
 	image_destroy(&pEnc->sCurrent, pEnc->mbParam.edged_width, pEnc->mbParam.edged_height);
 	image_destroy(&pEnc->sReference, pEnc->mbParam.edged_width, pEnc->mbParam.edged_height);
 	image_destroy(&pEnc->vInterH, pEnc->mbParam.edged_width, pEnc->mbParam.edged_height);
 	image_destroy(&pEnc->vInterV, pEnc->mbParam.edged_width, pEnc->mbParam.edged_height);
+	image_destroy(&pEnc->vInterVf, pEnc->mbParam.edged_width, pEnc->mbParam.edged_height);
 	image_destroy(&pEnc->vInterHV, pEnc->mbParam.edged_width, pEnc->mbParam.edged_height);
-	free(pEnc);
-
-	destroy_vlc_tables();
+	image_destroy(&pEnc->vInterHVf, pEnc->mbParam.edged_width, pEnc->mbParam.edged_height);
+#ifdef _DEBUG
+		image_destroy(&pEnc->sOriginal, pEnc->mbParam.edged_width, pEnc->mbParam.edged_height);
+#endif
+	xvid_free(pEnc);
 
 	return XVID_ERR_OK;
 }
@@ -217,6 +212,10 @@
 	Bitstream bs;
 	uint32_t bits;
 	uint16_t write_vol_header = 0;
+#ifdef _DEBUG
+	float psnr;
+	uint8_t temp[100];
+#endif
 
 	start_global_timer();
 
@@ -227,6 +226,7 @@
 
 	pEnc->mbParam.global_flags = pFrame->general;
 	pEnc->mbParam.motion_flags = pFrame->motion;
+	pEnc->mbParam.hint = &pFrame->hint;
 
 	start_timer();
 	if (image_input(&pEnc->sCurrent, pEnc->mbParam.width, pEnc->mbParam.height, pEnc->mbParam.edged_width,
@@ -236,6 +236,12 @@
 	}
 	stop_conv_timer();
 
+	EMMS();
+
+#ifdef _DEBUG
+	image_copy(&pEnc->sOriginal, &pEnc->sCurrent, pEnc->mbParam.edged_width, pEnc->mbParam.height);
+#endif
+
 	BitstreamInit(&bs, pFrame->bitstream, 0);
 
 	if (pFrame->quant == 0)
@@ -249,11 +255,16 @@
 
 	if ((pEnc->mbParam.global_flags & XVID_LUMIMASKING) > 0)
 	{
-		int * temp_dquants = (int *) malloc(pEnc->mbParam.mb_width * pEnc->mbParam.mb_height * sizeof(int));
+		int * temp_dquants = (int *) xvid_malloc(pEnc->mbParam.mb_width * pEnc->mbParam.mb_height * sizeof(int), CACHE_LINE);
 		
-		pEnc->mbParam.quant = adaptive_quantization(pEnc->sCurrent.y, pEnc->mbParam.width,
-							    temp_dquants, pFrame->quant, pFrame->quant,
-							    2*pFrame->quant, pEnc->mbParam.mb_width, pEnc->mbParam.mb_height);
+		pEnc->mbParam.quant = adaptive_quantization(pEnc->sCurrent.y,
+							    pEnc->mbParam.width,
+							    temp_dquants,
+							    pEnc->mbParam.quant,
+							    pEnc->mbParam.quant,
+							    2*pEnc->mbParam.quant,
+							    pEnc->mbParam.mb_width,
+							    pEnc->mbParam.mb_height);
 			
 		for (y = 0; y < pEnc->mbParam.mb_height; y++)
 			for (x = 0; x < pEnc->mbParam.mb_width; x++)
@@ -261,7 +272,7 @@
 				MACROBLOCK *pMB = &pEnc->pMBs[x + y * pEnc->mbParam.mb_width];
 				pMB->dquant = iDQtab[(temp_dquants[y * pEnc->mbParam.mb_width + x] + 2)];
 			}
-		free(temp_dquants);
+		xvid_free(temp_dquants);
 	}
 
 	if(pEnc->mbParam.global_flags & XVID_H263QUANT) {
@@ -272,6 +283,8 @@
 	else if(pEnc->mbParam.global_flags & XVID_MPEGQUANT) {
 		int ret1, ret2;
 
+		ret1 = ret2 = 0;
+
 		if(pEnc->mbParam.quant_type != MPEG4_QUANT)
 			write_vol_header = 1;
 		
@@ -312,7 +325,7 @@
 	BitstreamPutBits(&bs, 0xFFFF, 16);
 	BitstreamPad(&bs);
 	pFrame->length = BitstreamLength(&bs);
-		
+
 	if (pResult)
 	{
 		pResult->quant = pEnc->mbParam.quant;
@@ -322,11 +335,21 @@
 		pResult->ublks = pEnc->sStat.ublks;
 	}
    
-	if (pEnc->bitrate)
+	EMMS();
+
+	if (pFrame->quant == 0)
 	{
 		RateControlUpdate(pEnc->mbParam.quant, pFrame->length, pFrame->intra);
 	}
 
+#ifdef _DEBUG
+	psnr = image_psnr(&pEnc->sOriginal, &pEnc->sCurrent, pEnc->mbParam.edged_width,
+				pEnc->mbParam.width, pEnc->mbParam.height);
+
+	sprintf(temp, "PSNR: %f\n", psnr);
+	DEBUG(temp);
+#endif
+
 	pEnc->iFrameNum++;
 	image_swap(&pEnc->sCurrent, &pEnc->sReference);
 	
@@ -356,20 +379,221 @@
 }
 
 
+#define FCODEBITS	3
+#define MODEBITS	5
+
+void HintedMESet(Encoder * pEnc, int * intra)
+{
+	HINTINFO * hint;
+	Bitstream bs;
+	int length, high;
+	uint32_t x, y;
+
+	hint = pEnc->mbParam.hint;
+
+	if (hint->rawhints)
+	{
+		*intra = hint->mvhint.intra;
+	}
+	else
+	{
+		BitstreamInit(&bs, hint->hintstream, hint->hintlength);
+		*intra = BitstreamGetBit(&bs);
+	}
+
+	if (*intra)
+	{
+		return;
+	}
+
+	pEnc->mbParam.fixed_code = (hint->rawhints) ? hint->mvhint.fcode : BitstreamGetBits(&bs, FCODEBITS);
+
+	length	= pEnc->mbParam.fixed_code + 5;
+	high	= 1 << (length - 1);
+
+	for (y=0 ; y<pEnc->mbParam.mb_height ; ++y)
+	{
+		for (x=0 ; x<pEnc->mbParam.mb_width ; ++x)
+		{
+			MACROBLOCK * pMB = &pEnc->pMBs[x + y * pEnc->mbParam.mb_width];
+			MVBLOCKHINT * bhint = &hint->mvhint.block[x + y * pEnc->mbParam.mb_width];
+			VECTOR pred[4];
+			VECTOR tmp;
+			int dummy[4];
+			int vec;
+
+			pMB->mode = (hint->rawhints) ? bhint->mode : BitstreamGetBits(&bs, MODEBITS);
+
+			if (pMB->mode == MODE_INTER || pMB->mode == MODE_INTER_Q)
+			{
+				tmp.x  = (hint->rawhints) ? bhint->mvs[0].x : BitstreamGetBits(&bs, length);
+				tmp.y  = (hint->rawhints) ? bhint->mvs[0].y : BitstreamGetBits(&bs, length);
+				tmp.x -= (tmp.x >= high) ? high*2 : 0;
+				tmp.y -= (tmp.y >= high) ? high*2 : 0;
+
+				get_pmvdata(pEnc->pMBs, x, y, pEnc->mbParam.mb_width, 0, pred, dummy);
+
+				for (vec=0 ; vec<4 ; ++vec)
+				{
+					pMB->mvs[vec].x  = tmp.x;
+					pMB->mvs[vec].y  = tmp.y;
+					pMB->pmvs[vec].x = pMB->mvs[0].x - pred[0].x;
+					pMB->pmvs[vec].y = pMB->mvs[0].y - pred[0].y;
+				}
+			}
+			else if (pMB->mode == MODE_INTER4V)
+			{
+				for (vec=0 ; vec<4 ; ++vec)
+				{
+					tmp.x  = (hint->rawhints) ? bhint->mvs[vec].x : BitstreamGetBits(&bs, length);
+					tmp.y  = (hint->rawhints) ? bhint->mvs[vec].y : BitstreamGetBits(&bs, length);
+					tmp.x -= (tmp.x >= high) ? high*2 : 0;
+					tmp.y -= (tmp.y >= high) ? high*2 : 0;
+
+					get_pmvdata(pEnc->pMBs, x, y, pEnc->mbParam.mb_width, vec, pred, dummy);
+
+					pMB->mvs[vec].x  = tmp.x;
+					pMB->mvs[vec].y  = tmp.y;
+					pMB->pmvs[vec].x = pMB->mvs[vec].x - pred[0].x;
+					pMB->pmvs[vec].y = pMB->mvs[vec].y - pred[0].y;
+				}
+			}
+			else	// intra / intra_q / stuffing / not_coded
+			{
+				for (vec=0 ; vec<4 ; ++vec)
+				{
+					pMB->mvs[vec].x  = pMB->mvs[vec].y  = 0;
+				}
+			}
+		}
+	}
+}
+
+
+void HintedMEGet(Encoder * pEnc, int intra)
+{
+	HINTINFO * hint;
+	Bitstream bs;
+	uint32_t x, y;
+	int length, high;
+
+	hint = pEnc->mbParam.hint;
+
+	if (hint->rawhints)
+	{
+		hint->mvhint.intra = intra;
+	}
+	else
+	{
+		BitstreamInit(&bs, hint->hintstream, 0);
+		BitstreamPutBit(&bs, intra);
+	}
+
+	if (intra)
+	{
+		if (!hint->rawhints)
+		{
+			BitstreamPad(&bs);
+			hint->hintlength = BitstreamLength(&bs);
+		}
+		return;
+	}
+
+	length	= pEnc->mbParam.fixed_code + 5;
+	high	= 1 << (length - 1);
+
+	if (hint->rawhints)
+	{
+		hint->mvhint.fcode = pEnc->mbParam.fixed_code;
+	}
+	else
+	{
+		BitstreamPutBits(&bs, pEnc->mbParam.fixed_code, FCODEBITS);
+	}
+
+	for (y=0 ; y<pEnc->mbParam.mb_height ; ++y)
+	{
+		for (x=0 ; x<pEnc->mbParam.mb_width ; ++x)
+		{
+			MACROBLOCK * pMB = &pEnc->pMBs[x + y * pEnc->mbParam.mb_width];
+			MVBLOCKHINT * bhint = &hint->mvhint.block[x + y * pEnc->mbParam.mb_width];
+			VECTOR tmp;
+
+			if (hint->rawhints)
+			{
+				bhint->mode = pMB->mode;
+			}
+			else
+			{
+				BitstreamPutBits(&bs, pMB->mode, MODEBITS);
+			}
+
+			if (pMB->mode == MODE_INTER || pMB->mode == MODE_INTER_Q)
+			{
+				tmp.x  = pMB->mvs[0].x;
+				tmp.y  = pMB->mvs[0].y;
+				tmp.x += (tmp.x < 0) ? high*2 : 0;
+				tmp.y += (tmp.y < 0) ? high*2 : 0;
+
+				if (hint->rawhints)
+				{
+					bhint->mvs[0].x = tmp.x;
+					bhint->mvs[0].y = tmp.y;
+				}
+				else
+				{
+					BitstreamPutBits(&bs, tmp.x, length);
+					BitstreamPutBits(&bs, tmp.y, length);
+				}
+			}
+			else if (pMB->mode == MODE_INTER4V)
+			{
+				int vec;
+
+				for (vec=0 ; vec<4 ; ++vec)
+				{
+					tmp.x  = pMB->mvs[vec].x;
+					tmp.y  = pMB->mvs[vec].y;
+					tmp.x += (tmp.x < 0) ? high*2 : 0;
+					tmp.y += (tmp.y < 0) ? high*2 : 0;
+
+					if (hint->rawhints)
+					{
+						bhint->mvs[vec].x = tmp.x;
+						bhint->mvs[vec].y = tmp.y;
+					}
+					else
+					{
+						BitstreamPutBits(&bs, tmp.x, length);
+						BitstreamPutBits(&bs, tmp.y, length);
+					}
+				}
+			}
+		}
+	}
+
+	if (!hint->rawhints)
+	{
+		BitstreamPad(&bs);
+		hint->hintlength = BitstreamLength(&bs);
+	}
+}
+
+
 static int FrameCodeI(Encoder * pEnc, Bitstream * bs, uint32_t *pBits)
 {
-	int16_t dct_codes[6][64];
-	int16_t qcoeff[6][64];
+
+	DECLARE_ALIGNED_MATRIX(dct_codes, 6, 64, int16_t, CACHE_LINE);
+	DECLARE_ALIGNED_MATRIX(qcoeff,    6, 64, int16_t, CACHE_LINE);
+
 	uint16_t x, y;
 
 	pEnc->iFrameNum = 0;
 	pEnc->mbParam.rounding_type = 1;
 	pEnc->mbParam.coding_type = I_VOP;
 
-	BitstreamWriteVolHeader(bs, pEnc->mbParam.width, pEnc->mbParam.height, pEnc->mbParam.quant_type);
-	BitstreamWriteVopHeader(bs, I_VOP, pEnc->mbParam.rounding_type,
-				pEnc->mbParam.quant,
-				pEnc->mbParam.fixed_code); 
+	BitstreamWriteVolHeader(bs, &pEnc->mbParam);
+	BitstreamWriteVopHeader(bs, &pEnc->mbParam);
 
 	*pBits = BitstreamPos(bs);
 
@@ -384,7 +608,7 @@
 
 			CodeIntraMB(pEnc, pMB);
 
-			MBTransQuantIntra(&pEnc->mbParam, x, y, dct_codes, qcoeff, &pEnc->sCurrent);
+			MBTransQuantIntra(&pEnc->mbParam, pMB, x, y, dct_codes, qcoeff, &pEnc->sCurrent);
 
 			start_timer();
 			MBPrediction(&pEnc->mbParam, x, y, pEnc->mbParam.mb_width, qcoeff, pEnc->pMBs);
@@ -403,6 +627,11 @@
 	pEnc->sStat.iMvCount = 0;
 	pEnc->mbParam.fixed_code = 2;
 
+	if (pEnc->mbParam.global_flags & XVID_HINTEDME_GET)
+	{
+		HintedMEGet(pEnc, 1);
+	}
+
 	return 1;					 // intra
 }
 
@@ -412,8 +641,10 @@
 static int FrameCodeP(Encoder * pEnc, Bitstream * bs, uint32_t *pBits, bool force_inter, bool vol_header)
 {
 	float fSigma;
-	int16_t dct_codes[6][64];
-	int16_t qcoeff[6][64];
+
+	DECLARE_ALIGNED_MATRIX(dct_codes, 6, 64, int16_t, CACHE_LINE);
+	DECLARE_ALIGNED_MATRIX(qcoeff,    6, 64, int16_t, CACHE_LINE);
+
 	int iLimit;
 	uint32_t x, y;
 	int iSearchRange;
@@ -422,7 +653,14 @@
 	IMAGE *pCurrent = &pEnc->sCurrent;
 	IMAGE *pRef = &pEnc->sReference;
 
-	image_setedges(pRef,pEnc->mbParam.edged_width, pEnc->mbParam.edged_height, pEnc->mbParam.width, pEnc->mbParam.height);
+	start_timer();
+	image_setedges(pRef,
+		       pEnc->mbParam.edged_width,
+		       pEnc->mbParam.edged_height,
+		       pEnc->mbParam.width,
+		       pEnc->mbParam.height,
+		       pEnc->mbParam.global_flags & XVID_INTERLACING);
+	stop_edges_timer();
 
 	pEnc->mbParam.rounding_type = 1 - pEnc->mbParam.rounding_type;
 
@@ -440,22 +678,29 @@
 	}
 
 	start_timer();
-	bIntra = MotionEstimation(pEnc->pMBs, &pEnc->mbParam, &pEnc->sReference,
-				  &pEnc->vInterH, &pEnc->vInterV,
-				  &pEnc->vInterHV, &pEnc->sCurrent, iLimit);
+	if (pEnc->mbParam.global_flags & XVID_HINTEDME_SET)
+	{
+		HintedMESet(pEnc, &bIntra);
+	}
+	else
+	{
+		bIntra = MotionEstimation(pEnc->pMBs, &pEnc->mbParam, &pEnc->sReference,
+					  &pEnc->vInterH, &pEnc->vInterV,
+					  &pEnc->vInterHV, &pEnc->sCurrent, iLimit);
+	}
 	stop_motion_timer();
 
 	if (bIntra == 1)
+	{
 		return FrameCodeI(pEnc, bs, pBits);
+	}
 
 	pEnc->mbParam.coding_type = P_VOP;
 
 	if(vol_header)
-		BitstreamWriteVolHeader(bs, pEnc->mbParam.width, pEnc->mbParam.height, pEnc->mbParam.quant_type);
+		BitstreamWriteVolHeader(bs, &pEnc->mbParam);
 
-	BitstreamWriteVopHeader(bs, P_VOP, pEnc->mbParam.rounding_type,
-				pEnc->mbParam.quant,
-				pEnc->mbParam.fixed_code); 
+	BitstreamWriteVopHeader(bs, &pEnc->mbParam);
 
 	*pBits = BitstreamPos(bs);
 
@@ -475,9 +720,14 @@
 			if (!bIntra)
 			{
 				start_timer();
-				MBMotionCompensation(pMB, x, y, &pEnc->sReference,
-						     &pEnc->vInterH, &pEnc->vInterV,
-						     &pEnc->vInterHV, &pEnc->sCurrent, dct_codes,
+				MBMotionCompensation(pMB,
+						     x, y,
+						     &pEnc->sReference,
+						     &pEnc->vInterH,
+						     &pEnc->vInterV,
+						     &pEnc->vInterHV,
+						     &pEnc->sCurrent,
+						     dct_codes,
 						     pEnc->mbParam.width,
 						     pEnc->mbParam.height,
 						     pEnc->mbParam.edged_width,
@@ -494,12 +744,14 @@
 				}
 				pMB->quant = pEnc->mbParam.quant;
 
-				pMB->cbp = MBTransQuantInter(&pEnc->mbParam, x, y, dct_codes, qcoeff, pCurrent);
+				pMB->field_pred = 0;
+
+				pMB->cbp = MBTransQuantInter(&pEnc->mbParam, pMB, x, y, dct_codes, qcoeff, pCurrent);
 			}
 			else 
 			{
 				CodeIntraMB(pEnc, pMB);
-				MBTransQuantIntra(&pEnc->mbParam, x, y, dct_codes, qcoeff, pCurrent);
+				MBTransQuantIntra(&pEnc->mbParam, pMB, x, y, dct_codes, qcoeff, pCurrent);
 			}
 
 			start_timer();
@@ -531,6 +783,11 @@
 
 	emms();
 
+	if (pEnc->mbParam.global_flags & XVID_HINTEDME_GET)
+	{
+		HintedMEGet(pEnc, 0);
+	}
+
 	if (pEnc->sStat.iMvCount == 0)
 		pEnc->sStat.iMvCount = 1;
 
@@ -559,3 +816,130 @@
 
 	return 0;					 // inter
 }
+
+
+
+/*
+static void FrameCodeB(Encoder * pEnc, FRAMEINFO * frame, Bitstream * bs, uint32_t *pBits)
+{
+    int16_t dct_codes[6][64];
+    int16_t qcoeff[6][64];
+    uint32_t x, y;
+	VECTOR forward;
+	VECTOR backward;
+
+    IMAGE *f_ref = &pEnc->reference->image;
+	IMAGE *b_ref = &pEnc->current->image;
+
+	// forward 
+	image_setedges(f_ref, pEnc->mbParam.edged_width, pEnc->mbParam.edged_height, pEnc->mbParam.width, pEnc->mbParam.height);
+	start_timer();
+	image_interpolate(f_ref, &pEnc->f_refh, &pEnc->f_refv, &pEnc->f_refhv,
+		pEnc->mbParam.edged_width, pEnc->mbParam.edged_height, 0);
+	stop_inter_timer();
+
+	// backward
+	image_setedges(b_ref, pEnc->mbParam.edged_width, pEnc->mbParam.edged_height, pEnc->mbParam.width, pEnc->mbParam.height);
+    start_timer();
+	image_interpolate(b_ref, &pEnc->vInterH, &pEnc->vInterV, &pEnc->vInterHV,
+		pEnc->mbParam.edged_width, pEnc->mbParam.edged_height, 0);
+	stop_inter_timer();
+
+	start_timer();
+	MotionEstimationBVOP(&pEnc->mbParam, frame, 
+		pEnc->reference->mbs, f_ref, &pEnc->f_refh, &pEnc->f_refv, &pEnc->f_refhv,
+		pEnc->current->mbs, b_ref, &pEnc->vInterH, &pEnc->vInterV, &pEnc->vInterHV);
+
+	stop_motion_timer();
+	
+	if (test_quant_type(&pEnc->mbParam, pEnc->current))
+	{
+		BitstreamWriteVolHeader(bs, pEnc->mbParam.width, pEnc->mbParam.height, pEnc->mbParam.quant_type);
+	}
+
+    frame->coding_type = B_VOP;
+    BitstreamWriteVopHeader(bs, B_VOP, frame->tick, 0,
+			frame->quant, frame->fcode, frame->bcode);
+
+    *pBits = BitstreamPos(bs);
+
+    pEnc->sStat.iTextBits = 0;
+    pEnc->sStat.iMvSum = 0;
+    pEnc->sStat.iMvCount = 0;
+	pEnc->sStat.kblks = pEnc->sStat.mblks = pEnc->sStat.ublks = 0;
+
+
+    for (y = 0; y < pEnc->mbParam.mb_height; y++)
+	{
+		// reset prediction
+
+		forward.x = 0;
+		forward.y = 0;
+		backward.x = 0;
+		backward.y = 0;
+
+		for (x = 0; x < pEnc->mbParam.mb_width; x++)
+		{
+			MACROBLOCK * f_mb = &pEnc->reference->mbs[x + y * pEnc->mbParam.mb_width];
+			MACROBLOCK * b_mb = &pEnc->current->mbs[x + y * pEnc->mbParam.mb_width];
+			MACROBLOCK * mb = &frame->mbs[x + y * pEnc->mbParam.mb_width];
+
+			// decoder ignores mb when refence block is INTER(0,0), CBP=0 
+			if (mb->mode == MODE_NOT_CODED)
+			{
+				mb->mvs[0].x = 0;
+				mb->mvs[0].y = 0;
+				continue;
+			}
+
+			MBMotionCompensationBVOP(&pEnc->mbParam, mb, x, y, &frame->image,
+					f_ref, &pEnc->f_refh, &pEnc->f_refv, &pEnc->f_refhv, 
+					b_ref, &pEnc->vInterH, &pEnc->vInterV, &pEnc->vInterHV, 
+					dct_codes);
+	
+			mb->quant = frame->quant;
+			mb->cbp = MBTransQuantInter(&pEnc->mbParam, frame, x, y, dct_codes, qcoeff);
+			//mb->cbp = MBTransQuantBVOP(&pEnc->mbParam, x, y, dct_codes, qcoeff, &frame->image, frame->quant);
+
+
+			if ((mb->mode == MODE_INTERPOLATE || mb->mode == MODE_DIRECT) &&
+				mb->cbp == 0 &&
+				mb->mvs[0].x == 0 && 
+				mb->mvs[0].y == 0)
+			{
+				mb->mode = 5;  // skipped
+			}
+
+			if (mb->mode == MODE_INTERPOLATE || mb->mode == MODE_FORWARD)
+			{
+				mb->pmvs[0].x = mb->mvs[0].x - forward.x;
+				mb->pmvs[0].y = mb->mvs[0].y - forward.y;
+				forward.x = mb->mvs[0].x;
+				forward.y = mb->mvs[0].y;
+			}
+			
+			if (mb->mode == MODE_INTERPOLATE || mb->mode == MODE_BACKWARD)
+			{
+				mb->b_pmvs[0].x = mb->b_mvs[0].x - backward.x;
+				mb->b_pmvs[0].y = mb->b_mvs[0].y - backward.y;
+				backward.x = mb->b_mvs[0].x;
+				backward.y = mb->b_mvs[0].y;
+			}
+
+//			printf("[%i %i] M=%i CBP=%i MVX=%i MVY=%i %i,%i  %i,%i\n", x, y, pMB->mode, pMB->cbp, pMB->mvs[0].x, bmb->pmvs[0].x, bmb->pmvs[0].y, forward.x, forward.y);
+
+			start_timer();			
+			MBCodingBVOP(frame, mb, qcoeff, bs, &pEnc->sStat);
+			stop_coding_timer();
+		}
+	}
+
+	emms();
+
+	// TODO: dynamic fcode/bcode ???
+
+	*pBits = BitstreamPos(bs) - *pBits;
+
+}
+
+*/
\ No newline at end of file