--- trunk/xvidcore/src/encoder.c	2002/03/09 14:58:50	13
+++ trunk/xvidcore/src/encoder.c	2002/03/20 14:02:59	42
@@ -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
 
@@ -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), 16)) == 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, 16);
 	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;
 	}
 
@@ -187,6 +188,7 @@
 	}
 
 	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();
 
@@ -216,7 +218,6 @@
 	uint16_t x, y;
 	Bitstream bs;
 	uint32_t bits;
-	uint16_t quant_type = 0;
 	uint16_t write_vol_header = 0;
 
 	start_global_timer();
@@ -237,6 +238,8 @@
 	}
 	stop_conv_timer();
 
+	EMMS();
+
 	BitstreamInit(&bs, pFrame->bitstream, 0);
 
 	if (pFrame->quant == 0)
@@ -250,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), 16);
 		
 		pEnc->mbParam.quant = adaptive_quantization(pEnc->sCurrent.y, pEnc->mbParam.width,
 							    temp_dquants, pFrame->quant, pFrame->quant,
@@ -262,26 +265,32 @@
 				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)
-		quant_type = H263_QUANT;
-	else if(pEnc->mbParam.global_flags & XVID_MPEGQUANT)
-		quant_type = MPEG4_QUANT;
-
-	if(pEnc->mbParam.quant_type != quant_type) {
-		pEnc->mbParam.quant_type = quant_type;
-		write_vol_header = 1;
+	if(pEnc->mbParam.global_flags & XVID_H263QUANT) {
+		if(pEnc->mbParam.quant_type != H263_QUANT)
+			write_vol_header = 1;
+		pEnc->mbParam.quant_type = H263_QUANT;
 	}
-	else
-		write_vol_header = 0;
-
-	if ((pEnc->mbParam.global_flags & XVID_CUSTOM_QMATRIX) > 0)
-	{
+	else if(pEnc->mbParam.global_flags & XVID_MPEGQUANT) {
 		int ret1, ret2;
-		ret1 = set_intra_matrix(pFrame->quant_intra_matrix);
-		ret2 = set_inter_matrix(pFrame->quant_inter_matrix);
+
+		if(pEnc->mbParam.quant_type != MPEG4_QUANT)
+			write_vol_header = 1;
+		
+		pEnc->mbParam.quant_type = MPEG4_QUANT;
+		
+		if ((pEnc->mbParam.global_flags & XVID_CUSTOM_QMATRIX) > 0) {
+			if(pFrame->quant_intra_matrix != NULL)
+				ret1 = set_intra_matrix(pFrame->quant_intra_matrix);
+			if(pFrame->quant_inter_matrix != NULL)
+				ret2 = set_inter_matrix(pFrame->quant_inter_matrix);
+		}
+		else {
+			ret1 = set_intra_matrix(get_default_intra_matrix());
+			ret2 = set_inter_matrix(get_default_inter_matrix());
+		}
 		if(write_vol_header == 0)
 			write_vol_header = ret1 | ret2;
 	}
@@ -307,7 +316,7 @@
 	BitstreamPutBits(&bs, 0xFFFF, 16);
 	BitstreamPad(&bs);
 	pFrame->length = BitstreamLength(&bs);
-		
+
 	if (pResult)
 	{
 		pResult->quant = pEnc->mbParam.quant;
@@ -317,7 +326,9 @@
 		pResult->ublks = pEnc->sStat.ublks;
 	}
    
-	if (pEnc->bitrate)
+	EMMS();
+
+	if (pFrame->quant == 0)
 	{
 		RateControlUpdate(pEnc->mbParam.quant, pFrame->length, pFrame->intra);
 	}
@@ -353,8 +364,8 @@
 
 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;
@@ -407,8 +418,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;