--- branches/dev-api-4/xvidcore/src/motion/estimation_rd_based.c	2003/10/01 23:23:01	1161
+++ branches/dev-api-4/xvidcore/src/motion/estimation_rd_based.c	2003/10/07 13:02:35	1174
@@ -20,7 +20,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: estimation_rd_based.c,v 1.1.2.4 2003-10-01 23:23:01 edgomez Exp $
+ * $Id: estimation_rd_based.c,v 1.1.2.7 2003-10-07 13:02:35 edgomez Exp $
  *
  ****************************************************************************/
 
@@ -40,8 +40,7 @@
 #include "motion.h"
 #include "sad.h"
 #include "../bitstream/zigzag.h"
-#include "../quant/quant_mpeg4.h"
-#include "../quant/quant_h263.h"
+#include "../quant/quant.h"
 #include "../bitstream/vlc_codes.h"
 #include "../dct/fdct.h"
 #include "motion_inlines.h"
@@ -55,7 +54,8 @@
 				int16_t * const dqcoeff,
 				const uint32_t quant, const int quant_type,
 				uint32_t * cbp,
-				const int block)
+				const int block,
+				const uint16_t * scan_table)
 {
 	int sum;
 	int bits;
@@ -64,15 +64,15 @@
 
 	fdct(data);
 
-	if (quant_type) sum = quant_inter(coeff, data, quant);
-	else sum = quant4_inter(coeff, data, quant);
+	if (quant_type) sum = quant_h263_inter(coeff, data, quant);
+	else sum = quant_mpeg_inter(coeff, data, quant);
 
 	if (sum > 0) {
 		*cbp |= 1 << (5 - block);
-		bits = BITS_MULT * CodeCoeffInter_CalcBits(coeff, scan_tables[0]);
+		bits = BITS_MULT * CodeCoeffInter_CalcBits(coeff, scan_table);
 
-		if (quant_type) dequant_inter(dqcoeff, coeff, quant);
-		else dequant4_inter(dqcoeff, coeff, quant);
+		if (quant_type) dequant_h263_inter(dqcoeff, coeff, quant);
+		else dequant_mpeg_inter(dqcoeff, coeff, quant);
 
 		for (i = 0; i < 64; i++)
 			distortion += (data[i] - dqcoeff[i])*(data[i] - dqcoeff[i]);
@@ -93,7 +93,8 @@
 					const uint32_t quant, const int quant_type,
 					uint32_t * cbp,
 					const int block,
-					int * dcpred)
+					int * dcpred,
+					const uint16_t * scan_table)
 {
 	int bits, i;
 	int distortion = 0;
@@ -103,8 +104,8 @@
 	fdct(data);
 	data[0] -= 1024;
 
-	if (quant_type) quant_intra(coeff, data, quant, iDcScaler);
-	else quant4_intra(coeff, data, quant, iDcScaler);
+	if (quant_type) quant_h263_intra(coeff, data, quant, iDcScaler);
+	else quant_mpeg_intra(coeff, data, quant, iDcScaler);
 
 	b_dc = coeff[0];
 	if (block < 4) {
@@ -112,15 +113,15 @@
 		*dcpred = b_dc;
 	}
 
-	bits = BITS_MULT*CodeCoeffIntra_CalcBits(coeff, scan_tables[0]);
+	bits = BITS_MULT*CodeCoeffIntra_CalcBits(coeff, scan_table);
 	if (bits != 0) *cbp |= 1 << (5 - block);
 
 	if (block < 4) bits += BITS_MULT*dcy_tab[coeff[0] + 255].len;
 	else bits += BITS_MULT*dcc_tab[coeff[0] + 255].len;
 
 	coeff[0] = b_dc;
-	if (quant_type) dequant_intra(dqcoeff, coeff, quant, iDcScaler);
-	else dequant4_intra(dqcoeff, coeff, quant, iDcScaler);
+	if (quant_type) dequant_h263_intra(dqcoeff, coeff, quant, iDcScaler);
+	else dequant_mpeg_intra(dqcoeff, coeff, quant, iDcScaler);
 
 	for (i = 0; i < 64; i++)
 		distortion += (data[i] - dqcoeff[i])*(data[i] - dqcoeff[i]);
@@ -154,7 +155,7 @@
 	for(i = 0; i < 4; i++) {
 		int s = 8*((i&1) + (i>>1)*data->iEdgedWidth);
 		transfer_8to16subro(in, data->Cur + s, ptr + s, data->iEdgedWidth);
-		rd += data->temp[i] = Block_CalcBits(coeff, in, data->dctSpace + 128, data->iQuant, data->quant_type, &cbp, i);
+		rd += data->temp[i] = Block_CalcBits(coeff, in, data->dctSpace + 128, data->iQuant, data->quant_type, &cbp, i, data->scan_table);
 	}
 
 	rd += t = BITS_MULT*d_mv_bits(x, y, data->predMV, data->iFcode, data->qpel^data->qpel_precision, 0);
@@ -179,13 +180,13 @@
 	/* chroma U */
 	ptr = interpolate8x8_switch2(data->RefQ, data->RefP[4], 0, 0, xc, yc, data->iEdgedWidth/2, data->rounding);
 	transfer_8to16subro(in, data->CurU, ptr, data->iEdgedWidth/2);
-	rd += Block_CalcBits(coeff, in, data->dctSpace + 128, data->iQuant, data->quant_type, &cbp, 4);
+	rd += Block_CalcBits(coeff, in, data->dctSpace + 128, data->iQuant, data->quant_type, &cbp, 4, data->scan_table);
 	if (rd >= data->iMinSAD[0]) return;
 
 	/* chroma V */
 	ptr = interpolate8x8_switch2(data->RefQ, data->RefP[5], 0, 0, xc, yc, data->iEdgedWidth/2, data->rounding);
 	transfer_8to16subro(in, data->CurV, ptr, data->iEdgedWidth/2);
-	rd += Block_CalcBits(coeff, in, data->dctSpace + 128, data->iQuant, data->quant_type, &cbp, 5);
+	rd += Block_CalcBits(coeff, in, data->dctSpace + 128, data->iQuant, data->quant_type, &cbp, 5, data->scan_table);
 
 	rd += BITS_MULT*mcbpc_inter_tab[(MODE_INTER & 7) | ((cbp & 3) << 3)].len;
 
@@ -219,7 +220,7 @@
 	}
 
 	transfer_8to16subro(in, data->Cur, ptr, data->iEdgedWidth);
-	rd = Block_CalcBits(coeff, in, data->dctSpace + 128, data->iQuant, data->quant_type, &cbp, 5);
+	rd = Block_CalcBits(coeff, in, data->dctSpace + 128, data->iQuant, data->quant_type, &cbp, 5, data->scan_table);
 	rd += BITS_MULT*d_mv_bits(x, y, data->predMV, data->iFcode, data->qpel^data->qpel_precision, 0);
 
 	if (rd < data->iMinSAD[0]) {
@@ -421,14 +422,14 @@
 	/* chroma U */
 	ptr = interpolate8x8_switch2(Data->RefQ + 64, Data->RefP[4], 0, 0, sumx, sumy, Data->iEdgedWidth/2, Data->rounding);
 	transfer_8to16subro(in, Data->CurU, ptr, Data->iEdgedWidth/2);
-	bits += Block_CalcBits(coeff, in, Data->dctSpace + 128, Data->iQuant, Data->quant_type, &cbp, 4);
+	bits += Block_CalcBits(coeff, in, Data->dctSpace + 128, Data->iQuant, Data->quant_type, &cbp, 4, Data->scan_table);
 
 	if (bits >= *Data->iMinSAD) return bits;
 
 	/* chroma V */
 	ptr = interpolate8x8_switch2(Data->RefQ + 64, Data->RefP[5], 0, 0, sumx, sumy, Data->iEdgedWidth/2, Data->rounding);
 	transfer_8to16subro(in, Data->CurV, ptr, Data->iEdgedWidth/2);
-	bits += Block_CalcBits(coeff, in, Data->dctSpace + 128, Data->iQuant, Data->quant_type, &cbp, 5);
+	bits += Block_CalcBits(coeff, in, Data->dctSpace + 128, Data->iQuant, Data->quant_type, &cbp, 5, Data->scan_table);
 
 	bits += BITS_MULT*mcbpc_inter_tab[(MODE_INTER4V & 7) | ((cbp & 3) << 3)].len;
 
@@ -446,7 +447,7 @@
 	for(i = 0; i < 4; i++) {
 		int s = 8*((i&1) + (i>>1)*Data->iEdgedWidth);
 		transfer_8to16copy(in, Data->Cur + s, Data->iEdgedWidth);
-		bits += Block_CalcBitsIntra(coeff, in, Data->dctSpace + 128, Data->iQuant, Data->quant_type, &cbp, i, &dc);
+		bits += Block_CalcBitsIntra(coeff, in, Data->dctSpace + 128, Data->iQuant, Data->quant_type, &cbp, i, &dc, Data->scan_table);
 
 		if (bits >= Data->iMinSAD[0]) return bits;
 	}
@@ -455,13 +456,13 @@
 
 	/*chroma U */
 	transfer_8to16copy(in, Data->CurU, Data->iEdgedWidth/2);
-	bits += Block_CalcBitsIntra(coeff, in, Data->dctSpace + 128, Data->iQuant, Data->quant_type, &cbp, 4, &dc);
+	bits += Block_CalcBitsIntra(coeff, in, Data->dctSpace + 128, Data->iQuant, Data->quant_type, &cbp, 4, &dc, Data->scan_table);
 
 	if (bits >= Data->iMinSAD[0]) return bits;
 
 	/* chroma V */
 	transfer_8to16copy(in, Data->CurV, Data->iEdgedWidth/2);
-	bits += Block_CalcBitsIntra(coeff, in, Data->dctSpace + 128, Data->iQuant, Data->quant_type, &cbp, 5, &dc);
+	bits += Block_CalcBitsIntra(coeff, in, Data->dctSpace + 128, Data->iQuant, Data->quant_type, &cbp, 5, &dc, Data->scan_table);
 
 	bits += BITS_MULT*mcbpc_inter_tab[(MODE_INTRA & 7) | ((cbp & 3) << 3)].len;
 
@@ -478,7 +479,7 @@
 	for(i = 0; i < 4; i++) {
 		int s = 8*((i&1) + (i>>1)*Data->iEdgedWidth);
 		transfer_8to16subro(in, Data->Cur + s, vGMC->y + s + 16*(x+y*Data->iEdgedWidth), Data->iEdgedWidth);
-		bits += Block_CalcBits(coeff, in, Data->dctSpace + 128, Data->iQuant, Data->quant_type, &cbp, i);
+		bits += Block_CalcBits(coeff, in, Data->dctSpace + 128, Data->iQuant, Data->quant_type, &cbp, i, Data->scan_table);
 		if (bits >= Data->iMinSAD[0]) return bits;
 	}
 
@@ -486,13 +487,13 @@
 
 	/*chroma U */
 	transfer_8to16subro(in, Data->CurU, vGMC->u + 8*(x+y*(Data->iEdgedWidth/2)), Data->iEdgedWidth/2);
-	bits += Block_CalcBits(coeff, in, Data->dctSpace + 128, Data->iQuant, Data->quant_type, &cbp, 4);
+	bits += Block_CalcBits(coeff, in, Data->dctSpace + 128, Data->iQuant, Data->quant_type, &cbp, 4, Data->scan_table);
 
 	if (bits >= Data->iMinSAD[0]) return bits;
 
 	/* chroma V */
 	transfer_8to16subro(in, Data->CurV , vGMC->v + 8*(x+y*(Data->iEdgedWidth/2)), Data->iEdgedWidth/2);
-	bits += Block_CalcBits(coeff, in, Data->dctSpace + 128, Data->iQuant, Data->quant_type, &cbp, 5);
+	bits += Block_CalcBits(coeff, in, Data->dctSpace + 128, Data->iQuant, Data->quant_type, &cbp, 5, Data->scan_table);
 
 	bits += BITS_MULT*mcbpc_inter_tab[(MODE_INTER & 7) | ((cbp & 3) << 3)].len;
 
@@ -524,6 +525,8 @@
 	VECTOR backup[5], *v;
 	Data->iQuant = iQuant;
 	Data->cbp = c;
+	Data->scan_table = VopFlags & XVID_VOP_ALTERNATESCAN ?
+						scan_tables[2] : scan_tables[0];
 
 	pMB->mcsel = 0;
 
@@ -630,6 +633,8 @@
 	int InterBias = MV16_INTER_BIAS;
 	int thresh = 0;
 	int top = 0, top_right = 0, left = 0;
+	Data->scan_table = VopFlags & XVID_VOP_ALTERNATESCAN ?
+						scan_tables[2] : scan_tables[0];
 
 	pMB->mcsel = 0;