--- quant_mpeg4.c	2002/03/08 02:44:56	1.1.1.1
+++ quant_mpeg4.c	2004/03/22 22:36:24	1.10
@@ -40,10 +40,9 @@
  *
  *************************************************************************/
 
-
+#include "../global.h"
 #include "quant_mpeg4.h"
-
-
+#include "quant_matrix.h"
 
 // function pointers
 quant_intraFuncPtr quant4_intra;
@@ -52,8 +51,6 @@
 quant_interFuncPtr quant4_inter;
 
 
-#define DIV_DIV(A,B)    ( (A) > 0 ? ((A)+((B)>>1))/(B) : ((A)-((B)>>1))/(B) )
-#define SIGN(A)  ((A)>0?1:-1)
 #define VM18P    3
 #define VM18Q    4
 
@@ -64,42 +61,17 @@
 #define SCALEBITS    17
 #define FIX(X)        ((1UL << SCALEBITS) / (X) + 1)
 
-static const uint32_t multipliers[32] =
-{
-    0,          FIX(2),     FIX(4),     FIX(6),
-    FIX(8),     FIX(10),    FIX(12),    FIX(14),
-    FIX(16),    FIX(18),    FIX(20),    FIX(22),
-    FIX(24),    FIX(26),    FIX(28),    FIX(30),
-    FIX(32),    FIX(34),    FIX(36),    FIX(38),
-    FIX(40),    FIX(42),    FIX(44),    FIX(46),
-    FIX(48),    FIX(50),    FIX(52),    FIX(54),
-    FIX(56),    FIX(58),    FIX(60),    FIX(62)
-}; 
-
-
-static const int16_t default_intra_matrix[64] = {
-     8,17,18,19,21,23,25,27,
-    17,18,19,21,23,25,27,28,
-    20,21,22,23,24,26,28,30,
-    21,22,23,24,26,28,30,32,
-    22,23,24,26,28,30,32,35,
-    23,24,26,28,30,32,35,38,
-    25,26,28,30,32,35,38,41,
-    27,28,30,32,35,38,41,45
+static const uint32_t multipliers[32] = {
+	0, FIX(2), FIX(4), FIX(6),
+	FIX(8), FIX(10), FIX(12), FIX(14),
+	FIX(16), FIX(18), FIX(20), FIX(22),
+	FIX(24), FIX(26), FIX(28), FIX(30),
+	FIX(32), FIX(34), FIX(36), FIX(38),
+	FIX(40), FIX(42), FIX(44), FIX(46),
+	FIX(48), FIX(50), FIX(52), FIX(54),
+	FIX(56), FIX(58), FIX(60), FIX(62)
 };
 
-static const int16_t default_inter_matrix[64] = {
-    16,17,18,19,20,21,22,23,
-    17,18,19,20,21,22,23,24,
-    18,19,20,21,22,23,24,25,
-    19,20,21,22,23,24,26,27,
-    20,21,22,23,25,26,27,28,
-    21,22,23,24,26,27,28,30,
-    22,23,24,26,27,28,30,31,
-    23,24,25,27,28,30,31,33
-};
-
-
 /*    quantize intra-block
 
     // const int32_t quantd = DIV_DIV(VM18P*quant, VM18Q);
@@ -108,35 +80,38 @@
     // coeff[i] = (level + quantd) / quant2;
 */
 
-void quant4_intra_c(int16_t * coeff, const int16_t * data, const uint32_t quant, const uint32_t dcscalar)
+void
+quant4_intra_c(int16_t * coeff,
+			   const int16_t * data,
+			   const uint32_t quant,
+			   const uint32_t dcscalar)
 {
-    const uint32_t quantd = ((VM18P*quant) + (VM18Q/2)) / VM18Q;
-    const uint32_t mult = multipliers[quant];
-    uint32_t i;
-
-    coeff[0] = DIV_DIV(data[0], (int32_t)dcscalar);
-
-    for (i = 1; i < 64; i++)
-    {
-        if (data[i] < 0)
-        {
-            uint32_t level = -data[i];
-            level = ((level<<4) + (default_intra_matrix[i]>>1)) / default_intra_matrix[i];
-            level = ((level + quantd) * mult) >> 17;
-            coeff[i] = -(int16_t)level;
-        }
-        else if (data[i] > 0)
-        {
-            uint32_t level = data[i];
-            level = ((level<<4) + (default_intra_matrix[i]>>1)) / default_intra_matrix[i];
-            level = ((level + quantd) * mult) >> 17;
-            coeff[i] = level;
-        }
-        else
-        {
-            coeff[i] = 0;
-        }
-    }
+	const uint32_t quantd = ((VM18P * quant) + (VM18Q / 2)) / VM18Q;
+	const uint32_t mult = multipliers[quant];
+	uint32_t i;
+	int16_t *intra_matrix;
+
+	intra_matrix = get_intra_matrix();
+
+	coeff[0] = DIV_DIV(data[0], (int32_t) dcscalar);
+
+	for (i = 1; i < 64; i++) {
+		if (data[i] < 0) {
+			uint32_t level = -data[i];
+
+			level = ((level << 4) + (intra_matrix[i] >> 1)) / intra_matrix[i];
+			level = ((level + quantd) * mult) >> 17;
+			coeff[i] = -(int16_t) level;
+		} else if (data[i] > 0) {
+			uint32_t level = data[i];
+
+			level = ((level << 4) + (intra_matrix[i] >> 1)) / intra_matrix[i];
+			level = ((level + quantd) * mult) >> 17;
+			coeff[i] = level;
+		} else {
+			coeff[i] = 0;
+		}
+	}
 }
 
 
@@ -145,39 +120,40 @@
     // data[i] = (coeff[i] * default_intra_matrix[i] * quant2) >> 4;
 */
 
-void dequant4_intra_c(int16_t *data, const int16_t *coeff, const uint32_t quant, const uint32_t dcscalar)
+void
+dequant4_intra_c(int16_t * data,
+				 const int16_t * coeff,
+				 const uint32_t quant,
+				 const uint32_t dcscalar)
 {
-    uint32_t i;
-    
-    data[0] = coeff[0]  * dcscalar;
-    if (data[0] < -2048)
-    {
-        data[0] = -2048;
-    } 
-    else if (data[0] > 2047)
-    {
-        data[0] = 2047;
-    }
-
-    for (i = 1; i < 64; i++)
-    {
-        if (coeff[i] == 0)
-        {
-            data[i] = 0;
-        }
-        else if (coeff[i] < 0)
-        {
-            uint32_t level = -coeff[i];
-            level = (level * default_intra_matrix[i] * quant) >> 3;
-            data[i] = (level <= 2048 ? -(int16_t)level : -2048);
-        }
-        else // if (coeff[i] > 0)
-        {
-            uint32_t level = coeff[i];
-            level = (level * default_intra_matrix[i] * quant) >> 3;
-            data[i] = (level <= 2047 ? level : 2047);
-        }
-    }
+	uint32_t i;
+	int16_t *intra_matrix;
+
+	intra_matrix = get_intra_matrix();
+
+	data[0] = coeff[0] * dcscalar;
+	if (data[0] < -2048) {
+		data[0] = -2048;
+	} else if (data[0] > 2047) {
+		data[0] = 2047;
+	}
+
+	for (i = 1; i < 64; i++) {
+		if (coeff[i] == 0) {
+			data[i] = 0;
+		} else if (coeff[i] < 0) {
+			uint32_t level = -coeff[i];
+
+			level = (level * intra_matrix[i] * quant) >> 3;
+			data[i] = (level <= 2048 ? -(int16_t) level : -2048);
+		} else					// if (coeff[i] > 0)
+		{
+			uint32_t level = coeff[i];
+
+			level = (level * intra_matrix[i] * quant) >> 3;
+			data[i] = (level <= 2047 ? level : 2047);
+		}
+	}
 }
 
 
@@ -189,36 +165,38 @@
     // sum += abs(level);
 */
 
-uint32_t quant4_inter_c(int16_t * coeff, const int16_t * data, const uint32_t quant)
+uint32_t
+quant4_inter_c(int16_t * coeff,
+			   const int16_t * data,
+			   const uint32_t quant)
 {
-    const uint32_t mult = multipliers[quant];
-    uint32_t sum = 0;
-    uint32_t i;
-    
-    for (i = 0; i < 64; i++)
-    {
-        if (data[i] < 0)
-        {
-            uint32_t level = -data[i];
-            level = ((level<<4) + (default_inter_matrix[i]>>1)) / default_inter_matrix[i];
-            level = (level * mult) >> 17;
-            sum += level;
-            coeff[i] = -(int16_t)level;
-        }
-        else if (data[i] > 0)
-        {
-            uint32_t level = data[i];
-            level = ((level<<4) + (default_inter_matrix[i]>>1)) / default_inter_matrix[i];
-            level = (level * mult) >> 17;
-            sum += level;
-            coeff[i] = level;
-        }
-        else
-        {
-            coeff[i] = 0;
-        }
-    }
-    return sum;
+	const uint32_t mult = multipliers[quant];
+	uint32_t sum = 0;
+	uint32_t i;
+	int16_t *inter_matrix;
+
+	inter_matrix = get_inter_matrix();
+
+	for (i = 0; i < 64; i++) {
+		if (data[i] < 0) {
+			uint32_t level = -data[i];
+
+			level = ((level << 4) + (inter_matrix[i] >> 1)) / inter_matrix[i];
+			level = (level * mult) >> 17;
+			sum += level;
+			coeff[i] = -(int16_t) level;
+		} else if (data[i] > 0) {
+			uint32_t level = data[i];
+
+			level = ((level << 4) + (inter_matrix[i] >> 1)) / inter_matrix[i];
+			level = (level * mult) >> 17;
+			sum += level;
+			coeff[i] = level;
+		} else {
+			coeff[i] = 0;
+		}
+	}
+	return sum;
 }
 
 
@@ -227,37 +205,39 @@
   data = ((2 * coeff + SIGN(coeff)) * inter_matrix[i] * quant) / 16
 */
 
-void dequant4_inter_c(int16_t *data, const int16_t *coeff, const uint32_t quant)
+void
+dequant4_inter_c(int16_t * data,
+				 const int16_t * coeff,
+				 const uint32_t quant)
 {
-    uint32_t sum = 0;
-    uint32_t i;
-    
-    for (i = 0; i < 64; i++)
-    {
-        if (coeff[i] == 0)
-        {
-            data[i] = 0;
-        }
-        else if (coeff[i] < 0)
-        {
-            int32_t level = -coeff[i];
-            level = ((2 * level + 1) * default_inter_matrix[i] * quant) >> 4;
-            data[i] = (level <= 2048 ? -level : -2048);
-        } 
-        else // if (coeff[i] > 0)
-        {
-            uint32_t level = coeff[i];
-            level = ((2 * level + 1) * default_inter_matrix[i] * quant) >> 4;
-            data[i] = (level <= 2047 ? level : 2047);
-        }
-
-        sum ^= data[i];
-    }
-
-    // mismatch control
-
-    if ((sum & 1) == 0)
-    {
-        data[63] ^= 1;
-    }
+	uint32_t sum = 0;
+	uint32_t i;
+	int16_t *inter_matrix;
+
+	inter_matrix = get_inter_matrix();
+
+	for (i = 0; i < 64; i++) {
+		if (coeff[i] == 0) {
+			data[i] = 0;
+		} else if (coeff[i] < 0) {
+			int32_t level = -coeff[i];
+
+			level = ((2 * level + 1) * inter_matrix[i] * quant) >> 4;
+			data[i] = (level <= 2048 ? -level : -2048);
+		} else					// if (coeff[i] > 0)
+		{
+			uint32_t level = coeff[i];
+
+			level = ((2 * level + 1) * inter_matrix[i] * quant) >> 4;
+			data[i] = (level <= 2047 ? level : 2047);
+		}
+
+		sum ^= data[i];
+	}
+
+	// mismatch control
+
+	if ((sum & 1) == 0) {
+		data[63] ^= 1;
+	}
 }