--- branches/dev-api-4/xvidcore/src/quant/quant_matrix.c 2003/11/30 09:45:52 1229 +++ branches/dev-api-4/xvidcore/src/quant/quant_matrix.c 2003/11/30 16:13:16 1230 @@ -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: quant_matrix.c,v 1.13.2.2 2003-10-07 13:02:35 edgomez Exp $ + * $Id: quant_matrix.c,v 1.13.2.3 2003-11-30 16:13:16 edgomez Exp $ * ****************************************************************************/ @@ -29,9 +29,6 @@ #define FIX(X) (((X)==1) ? 0xFFFF : ((1UL << 16) / (X) + 1)) #define FIXL(X) ((1UL << 16) / (X) - 1) -static uint8_t custom_intra_matrix = 0; -static uint8_t custom_inter_matrix = 0; - /***************************************************************************** * Default matrices ****************************************************************************/ @@ -58,151 +55,16 @@ 23, 24, 25, 27, 28, 30, 31, 33 }; -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 -}; - -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) -}; - -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 -}; - -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) -{ - return custom_intra_matrix; -} - -uint8_t -get_inter_matrix_status(void) -{ - return custom_inter_matrix; -} - -void -set_intra_matrix_status(uint8_t status) +const uint16_t * +get_intra_matrix(const uint16_t * mpeg_quant_matrices) { - custom_intra_matrix = status; + return(mpeg_quant_matrices + 0*64); } -void -set_inter_matrix_status(uint8_t status) +const uint16_t * +get_inter_matrix(const uint16_t * mpeg_quant_matrices) { - custom_inter_matrix = status; -} - -const int16_t * -get_intra_matrix(void) -{ - return intra_matrix; -} - -const int16_t * -get_inter_matrix(void) -{ - return inter_matrix; + return(mpeg_quant_matrices + 4*64); } const uint8_t * @@ -217,45 +79,72 @@ return default_inter_matrix; } -uint8_t -set_intra_matrix(const uint8_t * matrix) +int +is_custom_intra_matrix(const uint16_t * mpeg_quant_matrices) { - int i, change = 0; + int i; + const uint16_t *intra_matrix = get_intra_matrix(mpeg_quant_matrices); + const uint8_t *def_intra_matrix = get_default_intra_matrix(); - custom_intra_matrix = 0; + for (i = 0; i < 64; i++) { + if(intra_matrix[i] != def_intra_matrix[i]) + return 1; + } + return 0; +} + +int +is_custom_inter_matrix(const uint16_t * mpeg_quant_matrices) +{ + int i; + const uint16_t *inter_matrix = get_inter_matrix(mpeg_quant_matrices); + const uint8_t *def_inter_matrix = get_default_inter_matrix(); 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]) - change = 1; + if(inter_matrix[i] != (uint16_t)def_inter_matrix[i]) + return 1; + } + return 0; +} - intra_matrix1[i] = ((intra_matrix[i] = (int16_t) matrix[i])>>1); +void +set_intra_matrix(uint16_t * mpeg_quant_matrices, const uint8_t * matrix) +{ + int i; + uint16_t *intra_matrix = mpeg_quant_matrices + 0*64; + uint16_t *intra_matrix1 = mpeg_quant_matrices + 1*64; + uint16_t *intra_matrix_fix = mpeg_quant_matrices + 2*64; + uint16_t *intra_matrix_fixl = mpeg_quant_matrices + 3*64; + + for (i = 0; i < 64; i++) { + intra_matrix[i] = (!i) ? (uint16_t)8: (uint16_t)matrix[i]; + intra_matrix1[i] = (intra_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(const uint8_t * matrix) +void +set_inter_matrix(uint16_t * mpeg_quant_matrices, const uint8_t * matrix) { - int i, change = 0; - - custom_inter_matrix = 0; + int i; + uint16_t *inter_matrix = mpeg_quant_matrices + 4*64; + uint16_t *inter_matrix1 = mpeg_quant_matrices + 5*64; + uint16_t *inter_matrix_fix = mpeg_quant_matrices + 6*64; + uint16_t *inter_matrix_fixl = mpeg_quant_matrices + 7*64; 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]) - change = 1; - 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; +} + +void +init_mpeg_matrix(uint16_t * mpeg_quant_matrices) { + + set_intra_matrix(mpeg_quant_matrices, default_intra_matrix); + set_inter_matrix(mpeg_quant_matrices, default_inter_matrix); }