--- quant_matrix.c	2002/03/08 19:16:35	1.2
+++ quant_matrix.c	2002/03/09 21:41:19	1.3
@@ -2,8 +2,19 @@
 
 #define FIX(X) (1 << 16) / (X) + 1
 
-uint8_t intra_matrix_changed;
-uint8_t inter_matrix_changed;
+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
+};
 
 int16_t intra_matrix[64] = {
      8,17,18,19,21,23,25,27,
@@ -27,6 +38,17 @@
     FIX(27),FIX(28),FIX(30),FIX(32),FIX(35),FIX(38),FIX(41),FIX(45)
 };
 
+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
+};
+
 int16_t inter_matrix[64] = {
     16,17,18,19,20,21,22,23,
     17,18,19,20,21,22,23,24,
@@ -50,58 +72,66 @@
 };
 
 uint8_t get_intra_matrix_status(void) {
-	return intra_matrix_changed;
+	return custom_intra_matrix;
 }
 
 uint8_t get_inter_matrix_status(void) {
-	return inter_matrix_changed;
+	return custom_inter_matrix;
 }
 
 void set_intra_matrix_status(uint8_t status) {
-	intra_matrix_changed = status;
+	custom_intra_matrix = status;
 }
 
 void set_inter_matrix_status(uint8_t status) {
-	inter_matrix_changed = status;
+	custom_inter_matrix = status;
 }
 
 int16_t *get_intra_matrix(void) {
 	return intra_matrix;
 }
 
-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) {
+	return default_inter_matrix;
 }
 
 uint8_t set_intra_matrix(uint8_t *matrix)
 {
-	int i;
+	int i, change = 0;
 	
-	intra_matrix_changed = 0;
+	custom_intra_matrix = 0;
 
 	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])
-			intra_matrix_changed = 1;
+			change = 1;
 
 		intra_matrix[i] = (int16_t) matrix[i];
 		intra_matrix_fix[i] = FIX(intra_matrix[i]);
 	}
-	return intra_matrix_changed;
+	return custom_intra_matrix | change;
 }
 
 
 uint8_t set_inter_matrix(uint8_t *matrix)
 {
-	int i;
+	int i, change = 0;
 	
-	inter_matrix_changed = 0;
+	custom_inter_matrix = 0;
 
 	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])
-			inter_matrix_changed = 1;
+			change = 1;
 
 		inter_matrix[i] = (int16_t) matrix[i];
 		inter_matrix_fix[i] = FIX(inter_matrix[i]);
 	}
-	return inter_matrix_changed;
+	return custom_inter_matrix | change;
 }