--- trunk/xvidcore/src/quant/quant_mpeg4.c 2002/11/25 13:38:56 676 +++ trunk/xvidcore/src/quant/quant_mpeg4.c 2002/11/26 23:44:11 677 @@ -50,7 +50,7 @@ * exception also makes it possible to release a modified version which * carries forward this exception. * - * $Id: quant_mpeg4.c,v 1.6 2002-11-17 00:41:19 edgomez Exp $ + * $Id: quant_mpeg4.c,v 1.7 2002-11-26 23:44:11 edgomez Exp $ * ****************************************************************************/ @@ -100,13 +100,14 @@ * Functions ****************************************************************************/ -/* quantize intra-block +#if 0 +/* quantize intra-block */ // const int32_t quantd = DIV_DIV(VM18P*quant, VM18Q); // // level = DIV_DIV(16 * data[i], default_intra_matrix[i]); // coeff[i] = (level + quantd) / quant2; -*/ +#endif void quant4_intra_c(int16_t * coeff, @@ -144,9 +145,9 @@ -/* dequantize intra-block & clamp to [-2048,2047] - // data[i] = (coeff[i] * default_intra_matrix[i] * quant2) >> 4; -*/ +/* dequantize intra-block & clamp to [-2048,2047] */ + /* data[i] = (coeff[i] * default_intra_matrix[i] * quant2) >> 4; */ + void dequant4_intra_c(int16_t * data, @@ -174,7 +175,7 @@ level = (level * intra_matrix[i] * quant) >> 3; data[i] = (level <= 2048 ? -(int16_t) level : -2048); - } else // if (coeff[i] > 0) + } else /* if (coeff[i] > 0) */ { uint32_t level = coeff[i]; @@ -186,12 +187,13 @@ -/* quantize inter-block +#if 0 +/* quantize inter-block */ // level = DIV_DIV(16 * data[i], default_intra_matrix[i]); // coeff[i] = (level + quantd) / quant2; // sum += abs(level); -*/ +#endif uint32_t quant4_inter_c(int16_t * coeff, @@ -252,7 +254,7 @@ level = ((2 * level + 1) * inter_matrix[i] * quant) >> 4; data[i] = (level <= 2048 ? -level : -2048); - } else // if (coeff[i] > 0) + } else /* if (coeff[i] > 0) */ { uint32_t level = coeff[i]; @@ -263,7 +265,7 @@ sum ^= data[i]; } - // mismatch control + /* mismatch control */ if ((sum & 1) == 0) { data[63] ^= 1;