--- quant_matrix.c 2002/10/19 11:41:11 1.10 +++ quant_matrix.c 2008/11/26 01:04:34 1.16 @@ -1,18 +1,10 @@ /***************************************************************************** * * XVID MPEG-4 VIDEO CODEC - * - Custom matrix quantization functions - + * - Quantization matrix management code - * * Copyright(C) 2002 Michael Militzer - * - * This program is an implementation of a part of one or more MPEG-4 - * Video tools as specified in ISO/IEC 14496-2 standard. Those intending - * to use this software module in hardware or software products are - * advised that its use may infringe existing patents or copyrights, and - * any such use would be at such party's own risk. The original - * developer of this software module and his/her company, and subsequent - * editors and their companies, will have no liability for use of this - * software or modifications or derivatives thereof. + * 2002 Peter Ross * * This program is free software ; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -28,24 +20,21 @@ * 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.10 2002/10/19 11:41:11 edgomez Exp $ + * $Id: quant_matrix.c,v 1.16 2008/11/26 01:04:34 Isibaar Exp $ * ****************************************************************************/ #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) /***************************************************************************** - * Local data + * Default matrices ****************************************************************************/ -/* ToDo : remove all this local to make this module thread safe */ -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, +static const 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, @@ -55,40 +44,7 @@ 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) -}; - -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] = { +static const 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, @@ -99,104 +55,102 @@ 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) -}; - -/***************************************************************************** - * Functions - ****************************************************************************/ - -uint8_t -get_intra_matrix_status(void) +const uint16_t * +get_intra_matrix(const uint16_t * mpeg_quant_matrices) { - return custom_intra_matrix; + return(mpeg_quant_matrices + 0*64); } -uint8_t -get_inter_matrix_status(void) +const uint16_t * +get_inter_matrix(const uint16_t * mpeg_quant_matrices) { - return custom_inter_matrix; + return(mpeg_quant_matrices + 4*64); } -void -set_intra_matrix_status(uint8_t status) +const uint8_t * +get_default_intra_matrix(void) { - custom_intra_matrix = status; + return default_intra_matrix; } -void -set_inter_matrix_status(uint8_t status) +const uint8_t * +get_default_inter_matrix(void) { - custom_inter_matrix = status; + return default_inter_matrix; } -int16_t * -get_intra_matrix(void) +int +is_custom_intra_matrix(const uint16_t * mpeg_quant_matrices) { - return intra_matrix; -} + int i; + const uint16_t *intra_matrix = get_intra_matrix(mpeg_quant_matrices); + const uint8_t *def_intra_matrix = get_default_intra_matrix(); -int16_t * -get_inter_matrix(void) -{ - return inter_matrix; + for (i = 0; i < 64; i++) { + if(intra_matrix[i] != def_intra_matrix[i]) + return 1; + } + return 0; } -uint8_t * -get_default_intra_matrix(void) +int +is_custom_inter_matrix(const uint16_t * mpeg_quant_matrices) { - return default_intra_matrix; + 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(inter_matrix[i] != (uint16_t)def_inter_matrix[i]) + return 1; + } + return 0; } -uint8_t * -get_default_inter_matrix(void) +void +set_intra_matrix(uint16_t * mpeg_quant_matrices, const uint8_t * matrix) { - return default_inter_matrix; + int i; + uint16_t *intra_matrix = mpeg_quant_matrices + 0*64; + + for (i = 0; i < 64; i++) { + intra_matrix[i] = (!i) ? (uint16_t)8: (uint16_t)matrix[i]; + } } -uint8_t -set_intra_matrix(uint8_t * matrix) +void +init_intra_matrix(uint16_t * mpeg_quant_matrices, uint32_t quant) { - int i, change = 0; - - custom_intra_matrix = 0; + int i; + uint16_t *intra_matrix = mpeg_quant_matrices + 0*64; + uint16_t *intra_matrix_rec = mpeg_quant_matrices + 1*64; 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; - - intra_matrix[i] = (int16_t) matrix[i]; - intra_matrix_fix[i] = FIX(intra_matrix[i]); + uint32_t div = intra_matrix[i]*quant; + intra_matrix_rec[i] = ((uint32_t)((1<>1)))/div; } - return /*custom_intra_matrix |*/ change; } - -uint8_t -set_inter_matrix(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_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; +} + +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); }