--- trunk/xvidcore/src/encoder.c	2002/03/09 21:44:47	20
+++ trunk/xvidcore/src/encoder.c	2002/03/26 11:16:08	69
@@ -16,6 +16,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 +82,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 +96,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 */
@@ -122,14 +123,14 @@
 
 	if (image_create(&pEnc->sCurrent, pEnc->mbParam.edged_width, pEnc->mbParam.edged_height) < 0)
 	{
-		free(pEnc);
+		xvid_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);
+		xvid_free(pEnc);
 		return XVID_ERR_MEMORY;
 	}
 
@@ -137,7 +138,7 @@
 	{
 		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);
+		xvid_free(pEnc);
 		return XVID_ERR_MEMORY;
 	}
 
@@ -146,7 +147,7 @@
 		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);
+		xvid_free(pEnc);
 		return XVID_ERR_MEMORY;
 	}
 
@@ -156,11 +157,11 @@
 		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);
+		xvid_free(pEnc);
 		return XVID_ERR_MEMORY;
 	}
 
-	pEnc->pMBs = malloc(sizeof(MACROBLOCK) * pEnc->mbParam.mb_width * pEnc->mbParam.mb_height);
+	pEnc->pMBs = xvid_malloc(sizeof(MACROBLOCK) * pEnc->mbParam.mb_width * pEnc->mbParam.mb_height, CACHE_LINE);
 	if (pEnc->pMBs == NULL)
 	{
 		image_destroy(&pEnc->sCurrent, pEnc->mbParam.edged_width, pEnc->mbParam.edged_height);
@@ -168,7 +169,7 @@
 		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->vInterHV, pEnc->mbParam.edged_width, pEnc->mbParam.edged_height);
-		free(pEnc);
+		xvid_free(pEnc);
 		return XVID_ERR_MEMORY;
 	}
 
@@ -182,11 +183,12 @@
 
 	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 * 100 / pParam->fincr,
+				pParam->max_quantizer, pParam->min_quantizer);
 	}
 
 	create_vlc_tables();
+	init_timer();
 
 	return XVID_ERR_OK;
 }
@@ -198,13 +200,13 @@
 	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->vInterHV, pEnc->mbParam.edged_width, pEnc->mbParam.edged_height);
-	free(pEnc);
+	xvid_free(pEnc);
 
 	destroy_vlc_tables();
 
@@ -236,6 +238,8 @@
 	}
 	stop_conv_timer();
 
+	EMMS();
+
 	BitstreamInit(&bs, pFrame->bitstream, 0);
 
 	if (pFrame->quant == 0)
@@ -249,7 +253,7 @@
 
 	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,
@@ -261,7 +265,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) {
@@ -312,7 +316,7 @@
 	BitstreamPutBits(&bs, 0xFFFF, 16);
 	BitstreamPad(&bs);
 	pFrame->length = BitstreamLength(&bs);
-		
+
 	if (pResult)
 	{
 		pResult->quant = pEnc->mbParam.quant;
@@ -322,7 +326,9 @@
 		pResult->ublks = pEnc->sStat.ublks;
 	}
    
-	if (pEnc->bitrate)
+	EMMS();
+
+	if (pFrame->quant == 0)
 	{
 		RateControlUpdate(pEnc->mbParam.quant, pFrame->length, pFrame->intra);
 	}
@@ -358,18 +364,16 @@
 
 static int FrameCodeI(Encoder * pEnc, Bitstream * bs, uint32_t *pBits)
 {
-	int16_t dct_codes[6][64];
-	int16_t qcoeff[6][64];
+	CACHE_ALIGN int16_t dct_codes[6][64];
+	CACHE_ALIGN int16_t qcoeff[6][64];
 	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 +388,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);
@@ -412,8 +416,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];
+
+	CACHE_ALIGN int16_t dct_codes[6][64];
+	CACHE_ALIGN int16_t qcoeff[6][64];
+
 	int iLimit;
 	uint32_t x, y;
 	int iSearchRange;
@@ -422,7 +428,9 @@
 	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;
 
@@ -451,11 +459,9 @@
 	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);
 
@@ -494,12 +500,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();