--- trunk/xvidcore/src/encoder.c	2002/03/24 20:07:31	66
+++ trunk/xvidcore/src/encoder.c	2002/03/28 20:57:25	78
@@ -255,9 +255,14 @@
 	{
 		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,
+							    pFrame->quant,
+							    pFrame->quant,
+							    2*pFrame->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++)
@@ -276,6 +281,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;
 		
@@ -364,18 +371,18 @@
 
 static int FrameCodeI(Encoder * pEnc, Bitstream * bs, uint32_t *pBits)
 {
-	CACHE_ALIGN int16_t dct_codes[6][64];
-	CACHE_ALIGN 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);
 
@@ -390,7 +397,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);
@@ -419,8 +426,8 @@
 {
 	float fSigma;
 
-	CACHE_ALIGN int16_t dct_codes[6][64];
-	CACHE_ALIGN 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;
@@ -430,7 +437,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;
 
@@ -459,11 +473,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);
 
@@ -483,9 +495,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,
@@ -502,12 +519,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();