[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

revision 677, Tue Nov 26 23:44:11 2002 UTC revision 851, Sat Feb 15 15:22:19 2003 UTC
# Line 1  Line 1 
 /*****************************************************************************  
  *  
  *  XVID MPEG-4 VIDEO CODEC  
  *  - Adaptive quantization functions -  
  *  
  *  Copyright(C) 2002 Peter Ross <pross@xvid.org>  
  *               2002 Christoph Lampert <gruel@web.de>  
  *  
  *  This file is part of XviD, a free MPEG-4 video encoder/decoder  
  *  
  *  XviD 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  
  *  
  *  Under section 8 of the GNU General Public License, the copyright  
  *  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 $  
  *  
  ****************************************************************************/  
   
1  #include "../portab.h"  #include "../portab.h"
2    #include "../global.h"
3  #include "adapt_quant.h"  #include "adapt_quant.h"
4    
5  #include <stdlib.h>                             /* free, malloc */  #include <stdlib.h>                             /* free, malloc */
6    
 #define MAX(a,b)      (((a) > (b)) ? (a) : (b))  
7  #define RDIFF(a,b)    ((int)(a+0.5)-(int)(b+0.5))  #define RDIFF(a,b)    ((int)(a+0.5)-(int)(b+0.5))
8    
 /*****************************************************************************  
  * Functions  
  ****************************************************************************/  
   
9  int  int
10  normalize_quantizer_field(float *in,  normalize_quantizer_field(float *in,
11                                                    int *out,                                                    int *out,
# Line 122  Line 61 
61                                            int min_quant,                                            int min_quant,
62                                            int max_quant,                                            int max_quant,
63                                            int mb_width,                                            int mb_width,
64                                            int mb_height)        /* no qstride because normalization */                                            int mb_height)        // no qstride because normalization
65  {  {
66          int i, j, k, l;          int i, j, k, l;
67    
# Line 148  Line 87 
87          if (!(quant = (float *) malloc(mb_width * mb_height * sizeof(float))))          if (!(quant = (float *) malloc(mb_width * mb_height * sizeof(float))))
88                  return(-1);                  return(-1);
89    
90          if(!(val = (float *) malloc(mb_width * mb_height * sizeof(float)))) {          if(!(val = (float *) malloc(mb_width * mb_height * sizeof(float))))
                 free(quant);  
91                  return(-1);                  return(-1);
         }  
92    
93          for (k = 0; k < mb_height; k++) {          for (k = 0; k < mb_height; k++) {
94                  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
95                  {                  {
96                          quant[k * mb_width + l] = (float) framequant;                          quant[k * mb_width + l] = (float) framequant;
97    
98                          /* calculate luminance-masking */                          // calculate luminance-masking
99                          ptr = &buf[16 * k * stride + 16 * l];   /* address of MB */                          ptr = &buf[16 * k * stride + 16 * l];   // address of MB
100    
101                          val[k * mb_width + l] = 0.;                          val[k * mb_width + l] = 0.;
102    
# Line 180  Line 117 
117          if (((global <GlobalBrightThres) &&(global >GlobalDarkThres))          if (((global <GlobalBrightThres) &&(global >GlobalDarkThres))
118                  || (mid_range < MidRangeThres)) {                  || (mid_range < MidRangeThres)) {
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
121                          {                          {
122                                  if (val[k * mb_width + l] < DarkThres)                                  if (val[k * mb_width + l] < DarkThres)
123                                          quant[k * mb_width + l] +=                                          quant[k * mb_width + l] +=

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

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