--- trunk/xvidcore/src/quant/quant_matrix.c	2002/03/09 21:44:47	20
+++ trunk/xvidcore/src/quant/quant_matrix.c	2003/02/15 15:22:19	851
@@ -1,137 +1,230 @@
 #include "quant_matrix.h"
 
-#define FIX(X) (1 << 16) / (X) + 1
+#define FIX(X)   (((X)==1) ? 0xFFFF : ((1UL << 16) / (X) + 1))
+#define FIXL(X)    ((1UL << 16) / (X) - 1)
 
 uint8_t custom_intra_matrix = 0;
 uint8_t custom_inter_matrix = 0;
 
 uint8_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
+	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
 };
 
 int16_t 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
-};
-
-int16_t intra_matrix_fix[64] = {
-     FIX(8),FIX(17),FIX(18),FIX(19),FIX(21),FIX(23),FIX(25),FIX(27),
-    FIX(17),FIX(18),FIX(19),FIX(21),FIX(23),FIX(25),FIX(27),FIX(28),
-    FIX(20),FIX(21),FIX(22),FIX(23),FIX(24),FIX(26),FIX(28),FIX(30),
-    FIX(21),FIX(22),FIX(23),FIX(24),FIX(26),FIX(28),FIX(30),FIX(32),
-    FIX(22),FIX(23),FIX(24),FIX(26),FIX(28),FIX(30),FIX(32),FIX(35),
-    FIX(23),FIX(24),FIX(26),FIX(28),FIX(30),FIX(32),FIX(35),FIX(38),
-    FIX(25),FIX(26),FIX(28),FIX(30),FIX(32),FIX(35),FIX(38),FIX(41),
-    FIX(27),FIX(28),FIX(30),FIX(32),FIX(35),FIX(38),FIX(41),FIX(45)
+	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
+};
+
+uint16_t intra_matrix_fixfix[64] = {
+	0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0
+};
+
+uint16_t inter_matrix_fixfix[64] = {
+	0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0
+};
+
+uint16_t intra_matrix1[64] = {
+	8>>1, 17>>1, 18>>1, 19>>1, 21>>1, 23>>1, 25>>1, 27>>1,
+	17>>1, 18>>1, 19>>1, 21>>1, 23>>1, 25>>1, 27>>1, 28>>1,
+	20>>1, 21>>1, 22>>1, 23>>1, 24>>1, 26>>1, 28>>1, 30>>1,
+	21>>1, 22>>1, 23>>1, 24>>1, 26>>1, 28>>1, 30>>1, 32>>1,
+	22>>1, 23>>1, 24>>1, 26>>1, 28>>1, 30>>1, 32>>1, 35>>1,
+	23>>1, 24>>1, 26>>1, 28>>1, 30>>1, 32>>1, 35>>1, 38>>1,
+	25>>1, 26>>1, 28>>1, 30>>1, 32>>1, 35>>1, 38>>1, 41>>1,
+	27>>1, 28>>1, 30>>1, 32>>1, 35>>1, 38>>1, 41>>1, 45>>1
+};
+
+
+uint16_t intra_matrix_fix[64] = {
+	FIX(8), FIX(17), FIX(18), FIX(19), FIX(21), FIX(23), FIX(25), FIX(27),
+	FIX(17), FIX(18), FIX(19), FIX(21), FIX(23), FIX(25), FIX(27), FIX(28),
+	FIX(20), FIX(21), FIX(22), FIX(23), FIX(24), FIX(26), FIX(28), FIX(30),
+	FIX(21), FIX(22), FIX(23), FIX(24), FIX(26), FIX(28), FIX(30), FIX(32),
+	FIX(22), FIX(23), FIX(24), FIX(26), FIX(28), FIX(30), FIX(32), FIX(35),
+	FIX(23), FIX(24), FIX(26), FIX(28), FIX(30), FIX(32), FIX(35), FIX(38),
+	FIX(25), FIX(26), FIX(28), FIX(30), FIX(32), FIX(35), FIX(38), FIX(41),
+	FIX(27), FIX(28), FIX(30), FIX(32), FIX(35), FIX(38), FIX(41), FIX(45)
+};
+
+uint16_t intra_matrix_fixl[64] = {
+	FIXL(8), FIXL(17), FIXL(18), FIXL(19), FIXL(21), FIXL(23), FIXL(25), FIXL(27),
+	FIXL(17), FIXL(18), FIXL(19), FIXL(21), FIXL(23), FIXL(25), FIXL(27), FIXL(28),
+	FIXL(20), FIXL(21), FIXL(22), FIXL(23), FIXL(24), FIXL(26), FIXL(28), FIXL(30),
+	FIXL(21), FIXL(22), FIXL(23), FIXL(24), FIXL(26), FIXL(28), FIXL(30), FIXL(32),
+	FIXL(22), FIXL(23), FIXL(24), FIXL(26), FIXL(28), FIXL(30), FIXL(32), FIXL(35),
+	FIXL(23), FIXL(24), FIXL(26), FIXL(28), FIXL(30), FIXL(32), FIXL(35), FIXL(38),
+	FIXL(25), FIXL(26), FIXL(28), FIXL(30), FIXL(32), FIXL(35), FIXL(38), FIXL(41),
+	FIXL(27), FIXL(28), FIXL(30), FIXL(32), FIXL(35), FIXL(38), FIXL(41), FIXL(45)
+};
+
+uint16_t inter_matrix_fixl[64] = {
+	FIXL(16), FIXL(17), FIXL(18), FIXL(19), FIXL(20), FIXL(21), FIXL(22), FIXL(23),
+	FIXL(17), FIXL(18), FIXL(19), FIXL(20), FIXL(21), FIXL(22), FIXL(23), FIXL(24),
+	FIXL(18), FIXL(19), FIXL(20), FIXL(21), FIXL(22), FIXL(23), FIXL(24), FIXL(25),
+	FIXL(19), FIXL(20), FIXL(21), FIXL(22), FIXL(23), FIXL(24), FIXL(26), FIXL(27),
+	FIXL(20), FIXL(21), FIXL(22), FIXL(23), FIXL(25), FIXL(26), FIXL(27), FIXL(28),
+	FIXL(21), FIXL(22), FIXL(23), FIXL(24), FIXL(26), FIXL(27), FIXL(28), FIXL(30),
+	FIXL(22), FIXL(23), FIXL(24), FIXL(26), FIXL(27), FIXL(28), FIXL(30), FIXL(31),
+	FIXL(23), FIXL(24), FIXL(25), FIXL(27), FIXL(28), FIXL(30), FIXL(31), FIXL(33)
 };
 
 uint8_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
+	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
 };
 
 int16_t 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
-};
-
-int16_t inter_matrix_fix[64] = {
-    FIX(16),FIX(17),FIX(18),FIX(19),FIX(20),FIX(21),FIX(22),FIX(23),
-    FIX(17),FIX(18),FIX(19),FIX(20),FIX(21),FIX(22),FIX(23),FIX(24),
-    FIX(18),FIX(19),FIX(20),FIX(21),FIX(22),FIX(23),FIX(24),FIX(25),
-    FIX(19),FIX(20),FIX(21),FIX(22),FIX(23),FIX(24),FIX(26),FIX(27),
-    FIX(20),FIX(21),FIX(22),FIX(23),FIX(25),FIX(26),FIX(27),FIX(28),
-    FIX(21),FIX(22),FIX(23),FIX(24),FIX(26),FIX(27),FIX(28),FIX(30),
-    FIX(22),FIX(23),FIX(24),FIX(26),FIX(27),FIX(28),FIX(30),FIX(31),
-    FIX(23),FIX(24),FIX(25),FIX(27),FIX(28),FIX(30),FIX(31),FIX(33)
+	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
+};
+uint16_t inter_matrix1[64] = {
+	16>>1, 17>>1, 18>>1, 19>>1, 20>>1, 21>>1, 22>>1, 23>>1,
+	17>>1, 18>>1, 19>>1, 20>>1, 21>>1, 22>>1, 23>>1, 24>>1,
+	18>>1, 19>>1, 20>>1, 21>>1, 22>>1, 23>>1, 24>>1, 25>>1,
+	19>>1, 20>>1, 21>>1, 22>>1, 23>>1, 24>>1, 26>>1, 27>>1,
+	20>>1, 21>>1, 22>>1, 23>>1, 25>>1, 26>>1, 27>>1, 28>>1,
+	21>>1, 22>>1, 23>>1, 24>>1, 26>>1, 27>>1, 28>>1, 30>>1,
+	22>>1, 23>>1, 24>>1, 26>>1, 27>>1, 28>>1, 30>>1, 31>>1,
+	23>>1, 24>>1, 25>>1, 27>>1, 28>>1, 30>>1, 31>>1, 33>>1
+};
+
+uint16_t inter_matrix_fix[64] = {
+	FIX(16), FIX(17), FIX(18), FIX(19), FIX(20), FIX(21), FIX(22), FIX(23),
+	FIX(17), FIX(18), FIX(19), FIX(20), FIX(21), FIX(22), FIX(23), FIX(24),
+	FIX(18), FIX(19), FIX(20), FIX(21), FIX(22), FIX(23), FIX(24), FIX(25),
+	FIX(19), FIX(20), FIX(21), FIX(22), FIX(23), FIX(24), FIX(26), FIX(27),
+	FIX(20), FIX(21), FIX(22), FIX(23), FIX(25), FIX(26), FIX(27), FIX(28),
+	FIX(21), FIX(22), FIX(23), FIX(24), FIX(26), FIX(27), FIX(28), FIX(30),
+	FIX(22), FIX(23), FIX(24), FIX(26), FIX(27), FIX(28), FIX(30), FIX(31),
+	FIX(23), FIX(24), FIX(25), FIX(27), FIX(28), FIX(30), FIX(31), FIX(33)
 };
 
-uint8_t get_intra_matrix_status(void) {
+uint8_t
+get_intra_matrix_status(void)
+{
 	return custom_intra_matrix;
 }
 
-uint8_t get_inter_matrix_status(void) {
+uint8_t
+get_inter_matrix_status(void)
+{
 	return custom_inter_matrix;
 }
 
-void set_intra_matrix_status(uint8_t status) {
+void
+set_intra_matrix_status(uint8_t status)
+{
 	custom_intra_matrix = status;
 }
 
-void set_inter_matrix_status(uint8_t status) {
+void
+set_inter_matrix_status(uint8_t status)
+{
 	custom_inter_matrix = status;
 }
 
-int16_t *get_intra_matrix(void) {
+int16_t *
+get_intra_matrix(void)
+{
 	return intra_matrix;
 }
 
-uint8_t *get_default_intra_matrix(void) {
+int16_t *
+get_inter_matrix(void)
+{
+	return inter_matrix;
+}
+
+uint8_t *
+get_default_intra_matrix(void)
+{
 	return default_intra_matrix;
 }
 
-uint8_t *get_default_inter_matrix(void) {
+uint8_t *
+get_default_inter_matrix(void)
+{
 	return default_inter_matrix;
 }
 
-uint8_t set_intra_matrix(uint8_t *matrix)
+uint8_t
+set_intra_matrix(uint8_t * matrix)
 {
 	int i, change = 0;
-	
+
 	custom_intra_matrix = 0;
 
-	for(i = 0; i < 64; i++) {
-		if((int16_t) default_intra_matrix[i] != matrix[i])
+	for (i = 0; i < 64; i++) {
+		if ((int16_t) default_intra_matrix[i] != matrix[i])
 			custom_intra_matrix = 1;
-		if(intra_matrix[i] != matrix[i])
+		if (intra_matrix[i] != matrix[i])
 			change = 1;
 
-		intra_matrix[i] = (int16_t) matrix[i];
+		intra_matrix1[i] = ((intra_matrix[i] = (int16_t) matrix[i])>>1);
+		intra_matrix1[i] += ((intra_matrix[i] == 1) ? 1: 0);
 		intra_matrix_fix[i] = FIX(intra_matrix[i]);
+		intra_matrix_fixl[i] = FIXL(intra_matrix[i]);
 	}
 	return custom_intra_matrix | change;
 }
 
 
-uint8_t set_inter_matrix(uint8_t *matrix)
+uint8_t
+set_inter_matrix(uint8_t * matrix)
 {
 	int i, change = 0;
-	
+
 	custom_inter_matrix = 0;
 
-	for(i = 0; i < 64; i++) {
-		if((int16_t) default_inter_matrix[i] != matrix[i])
+	for (i = 0; i < 64; i++) {
+		if ((int16_t) default_inter_matrix[i] != matrix[i])
 			custom_inter_matrix = 1;
-		if(inter_matrix[i] != matrix[i])
+		if (inter_matrix[i] != matrix[i])
 			change = 1;
 
-		inter_matrix[i] = (int16_t) matrix[i];
+		inter_matrix1[i] = ((inter_matrix[i] = (int16_t) matrix[i])>>1);
+		inter_matrix1[i] += ((inter_matrix[i] == 1) ? 1: 0);
 		inter_matrix_fix[i] = FIX(inter_matrix[i]);
+		inter_matrix_fixl[i] = FIXL(inter_matrix[i]);
 	}
 	return custom_inter_matrix | change;
 }