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

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

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

trunk/xvidcore/src/quant/adapt_quant.c revision 677, Tue Nov 26 23:44:11 2002 UTC branches/dev-api-4/xvidcore/src/quant/adapt_quant.c revision 1054, Mon Jun 9 13:55:56 2003 UTC
# Line 1  Line 1 
1  /*****************************************************************************  /*****************************************************************************
2   *   *
3   *  XVID MPEG-4 VIDEO CODEC   *  XVID MPEG-4 VIDEO CODEC
4   *  - Adaptive quantization functions -   *  - Deprecated code  -
5   *   *
6   *  Copyright(C) 2002 Peter Ross <pross@xvid.org>   *  Copyright(C) 2002 Peter Ross <pross@xvid.org>
7   *               2002 Christoph Lampert <gruel@web.de>   *               2002 Christoph Lampert <gruel@web.de>
8   *   *
9   *  This file is part of XviD, a free MPEG-4 video encoder/decoder   *  This program is free software ; you can redistribute it and/or modify
10   *   *  it under the terms of the GNU General Public License as published by
  *  XviD is free software; you can redistribute it and/or modify it  
  *  under the terms of the GNU General Public License as published by  
11   *  the Free Software Foundation; either version 2 of the License, or   *  the Free Software Foundation; either version 2 of the License, or
12   *  (at your option) any later version.   *  (at your option) any later version.
13   *   *
# Line 22  Line 20 
20   *  along with this program; if not, write to the Free Software   *  along with this program; if not, write to the Free Software
21   *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA   *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
22   *   *
23   *  Under section 8 of the GNU General Public License, the copyright   * $Id: adapt_quant.c,v 1.14.2.2 2003-06-09 13:55:10 edgomez Exp $
  *  holders of XVID explicitly forbid distribution in the following  
  *  countries:  
  *  
  *    - Japan  
  *    - United States of America  
  *  
  *  Linking XviD statically or dynamically with other modules is making a  
  *  combined work based on XviD.  Thus, the terms and conditions of the  
  *  GNU General Public License cover the whole combination.  
  *  
  *  As a special exception, the copyright holders of XviD give you  
  *  permission to link XviD with independent modules that communicate with  
  *  XviD solely through the VFW1.1 and DShow interfaces, regardless of the  
  *  license terms of these independent modules, and to copy and distribute  
  *  the resulting combined work under terms of your choice, provided that  
  *  every copy of the combined work is accompanied by a complete copy of  
  *  the source code of XviD (the version of XviD used to produce the  
  *  combined work), being distributed under the terms of the GNU General  
  *  Public License plus this exception.  An independent module is a module  
  *  which is not derived from or based on XviD.  
  *  
  *  Note that people who make modified versions of XviD are not obligated  
  *  to grant this special exception for their modified versions; it is  
  *  their choice whether to do so.  The GNU General Public License gives  
  *  permission to release a modified version without this exception; this  
  *  exception also makes it possible to release a modified version which  
  *  carries forward this exception.  
  *  
  * $Id: adapt_quant.c,v 1.13 2002-11-26 23:44:11 edgomez Exp $  
24   *   *
25   ****************************************************************************/   ****************************************************************************/
26    
27  #include "../portab.h"  #include "../portab.h"
28    #include "../global.h"
29  #include "adapt_quant.h"  #include "adapt_quant.h"
30    
31  #include <stdlib.h>                             /* free, malloc */  #include <stdlib.h>                             /* free, malloc */
32    
 #define MAX(a,b)      (((a) > (b)) ? (a) : (b))  
33  #define RDIFF(a,b)    ((int)(a+0.5)-(int)(b+0.5))  #define RDIFF(a,b)    ((int)(a+0.5)-(int)(b+0.5))
34    
 /*****************************************************************************  
  * Functions  
  ****************************************************************************/  
   
35  int  int
36  normalize_quantizer_field(float *in,  normalize_quantizer_field(float *in,
37                                                    int *out,                                                    int *out,
# Line 148  Line 113 
113          if (!(quant = (float *) malloc(mb_width * mb_height * sizeof(float))))          if (!(quant = (float *) malloc(mb_width * mb_height * sizeof(float))))
114                  return(-1);                  return(-1);
115    
116          if(!(val = (float *) malloc(mb_width * mb_height * sizeof(float)))) {          if(!(val = (float *) malloc(mb_width * mb_height * sizeof(float))))
                 free(quant);  
117                  return(-1);                  return(-1);
         }  
118    
119          for (k = 0; k < mb_height; k++) {          for (k = 0; k < mb_height; k++) {
120                  for (l = 0; l < mb_width; l++)  /* do this for all macroblocks individually  */                  for (l = 0; l < mb_width; l++)  /* do this for all macroblocks individually  */

Legend:
Removed from v.677  
changed lines
  Added in v.1054

No admin address has been configured
ViewVC Help
Powered by ViewVC 1.0.4