--- trunk/xvidcore/src/quant/quant_mpeg4.c	2002/09/21 03:11:36	499
+++ trunk/xvidcore/src/quant/quant_mpeg4.c	2003/02/15 15:22:19	851
@@ -1,64 +1,62 @@
-/*****************************************************************************
+/**************************************************************************
  *
- *  XVID MPEG-4 VIDEO CODEC
- *  - Mpeg4 quantization/dequantization functions -
+ *    XVID MPEG-4 VIDEO CODEC
+ *    mpeg-4 quantization/dequantization
  *
- *  Copyright(C) 2002 Peter Ross <pross@xvid.org>
+ *    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.
  *
- *  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.
- *
- *  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
- *  the Free Software Foundation ; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY ; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program ; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+ *    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
+ *    the Free Software Foundation; either version 2 of the License, or
+ *    (at your option) any later version.
  *
- *  $Id: quant_mpeg4.c,v 1.5 2002-09-21 03:07:56 suxen_drol Exp $
+ *    This program is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
  *
- ****************************************************************************/
+ *    You should have received a copy of the GNU General Public License
+ *    along with this program; if not, write to the Free Software
+ *    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ *************************************************************************/
+
+/**************************************************************************
+ *
+ *    History:
+ *
+ *	26.01.2002    fixed  quant4_intra dcscalar signed/unsigned error
+ *  20.01.2002    increased accuracy of >> divide
+ *  26.12.2001    divide-by-multiplication optimization
+ *  22.12.2001    [-127,127] clamping removed; minor tweaks
+ *	19.11.2001    inital version <pross@cs.rmit.edu.au>
+ *
+ *************************************************************************/
 
+#include "../global.h"
 #include "quant_mpeg4.h"
 #include "quant_matrix.h"
 
-/*****************************************************************************
- * Function pointers
- ****************************************************************************/
-
+// function pointers
 quant_intraFuncPtr quant4_intra;
 quant_intraFuncPtr dequant4_intra;
 dequant_interFuncPtr dequant4_inter;
 quant_interFuncPtr quant4_inter;
 
 
-/*****************************************************************************
- * Local data
- ****************************************************************************/
-
-#define DIV_DIV(A,B)    ( (A) > 0 ? ((A)+((B)>>1))/(B) : ((A)-((B)>>1))/(B) )
-#define SIGN(A)  ((A)>0?1:-1)
 #define VM18P    3
 #define VM18Q    4
 
 
-/*
- * divide-by-multiply table
- * need 17 bit shift (16 causes slight errors when q > 19)
- */
+// divide-by-multiply table
+// need 17 bit shift (16 causes slight errors when q > 19)
 
 #define SCALEBITS    17
 #define FIX(X)        ((1UL << SCALEBITS) / (X) + 1)
@@ -74,10 +72,6 @@
 	FIX(56), FIX(58), FIX(60), FIX(62)
 };
 
-/*****************************************************************************
- * Functions
- ****************************************************************************/
-
 /*    quantize intra-block
 
     // const int32_t quantd = DIV_DIV(VM18P*quant, VM18Q);