[svn] / branches / dev-api-4 / xvidcore / src / quant / quant_matrix.c Repository:
ViewVC logotype

Diff of /branches/dev-api-4/xvidcore/src/quant/quant_matrix.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 447, Sat Sep 7 14:16:13 2002 UTC revision 605, Sat Oct 19 12:20:33 2002 UTC
# Line 3  Line 3 
3   *  XVID MPEG-4 VIDEO CODEC   *  XVID MPEG-4 VIDEO CODEC
4   *  - Custom matrix quantization functions -   *  - Custom matrix quantization functions -
5   *   *
6   *  Copyright(C) 2002 Michael Militzer   *  Copyright(C) 2002 Michael Militzer <isibaar@xvid.org>
7     *               2002 Peter Ross <pross@xvid.org>
8   *   *
9   *  This program is an implementation of a part of one or more MPEG-4   *  This program is an implementation of a part of one or more MPEG-4
10   *  Video tools as specified in ISO/IEC 14496-2 standard.  Those intending   *  Video tools as specified in ISO/IEC 14496-2 standard.  Those intending
# Line 28  Line 29 
29   *  along with this program ; if not, write to the Free Software   *  along with this program ; if not, write to the Free Software
30   *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA   *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
31   *   *
32   *  $Id: quant_matrix.c,v 1.7 2002-09-07 14:16:13 edgomez Exp $   *  $Id: quant_matrix.c,v 1.11 2002-10-19 12:20:33 edgomez Exp $
33   *   *
34   ****************************************************************************/   ****************************************************************************/
35    
# Line 44  Line 45 
45  uint8_t custom_intra_matrix = 0;  uint8_t custom_intra_matrix = 0;
46  uint8_t custom_inter_matrix = 0;  uint8_t custom_inter_matrix = 0;
47    
48  uint8_t const default_intra_matrix[64] = {  uint8_t default_intra_matrix[64] = {
49          8, 17, 18, 19, 21, 23, 25, 27,          8, 17, 18, 19, 21, 23, 25, 27,
50          17, 18, 19, 21, 23, 25, 27, 28,          17, 18, 19, 21, 23, 25, 27, 28,
51          20, 21, 22, 23, 24, 26, 28, 30,          20, 21, 22, 23, 24, 26, 28, 30,
# Line 77  Line 78 
78          FIX(27), FIX(28), FIX(30), FIX(32), FIX(35), FIX(38), FIX(41), FIX(45)          FIX(27), FIX(28), FIX(30), FIX(32), FIX(35), FIX(38), FIX(41), FIX(45)
79  };  };
80    
81  uint8_t const default_inter_matrix[64] = {  uint8_t default_inter_matrix[64] = {
82          16, 17, 18, 19, 20, 21, 22, 23,          16, 17, 18, 19, 20, 21, 22, 23,
83          17, 18, 19, 20, 21, 22, 23, 24,          17, 18, 19, 20, 21, 22, 23, 24,
84          18, 19, 20, 21, 22, 23, 24, 25,          18, 19, 20, 21, 22, 23, 24, 25,
# Line 178  Line 179 
179                  intra_matrix[i] = (int16_t) matrix[i];                  intra_matrix[i] = (int16_t) matrix[i];
180                  intra_matrix_fix[i] = FIX(intra_matrix[i]);                  intra_matrix_fix[i] = FIX(intra_matrix[i]);
181          }          }
182          return custom_intra_matrix | change;          return /*custom_intra_matrix |*/ change;
183  }  }
184    
185    
# Line 198  Line 199 
199                  inter_matrix[i] = (int16_t) matrix[i];                  inter_matrix[i] = (int16_t) matrix[i];
200                  inter_matrix_fix[i] = FIX(inter_matrix[i]);                  inter_matrix_fix[i] = FIX(inter_matrix[i]);
201          }          }
202          return custom_inter_matrix | change;          return /*custom_inter_matrix |*/ change;
203  }  }
Legend:
Removed from v.447  
changed lines
  Added in v.605
No admin address has been configured
 ViewVC Help
Powered by ViewVC 1.0.4