[svn] / trunk / xvidcore / src / image / reduced.c Repository:
ViewVC logotype

Diff of /trunk/xvidcore/src/image/reduced.c

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

revision 851, Sat Feb 15 15:22:19 2003 UTC revision 1466, Mon May 31 21:36:23 2004 UTC
# Line 5  Line 5 
5   *   *
6   *  Copyright(C) 2002 Pascal Massimino <skal@planet-d.net>   *  Copyright(C) 2002 Pascal Massimino <skal@planet-d.net>
7   *   *
  *  This file is part of XviD, a free MPEG-4 video encoder/decoder  
  *  
8   *  XviD is free software; you can redistribute it and/or modify it   *  XviD is free software; you can redistribute it and/or modify it
9   *  under the terms of the GNU General Public License as published by   *  under the terms of the GNU General Public License as published by
10   *  the Free Software Foundation; either version 2 of the License, or   *  the Free Software Foundation; either version 2 of the License, or
# Line 21  Line 19 
19   *  along with this program; if not, write to the Free Software   *  along with this program; if not, write to the Free Software
20   *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA   *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
21   *   *
22   *  Under section 8 of the GNU General Public License, the copyright   * $Id: reduced.c,v 1.4 2004-05-31 21:36:23 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: reduced.c,v 1.2 2003-02-15 15:22:18 edgomez Exp $  
23   *   *
24   ****************************************************************************/   ****************************************************************************/
25    
# Line 58  Line 27 
27  #include "../global.h"  #include "../global.h"
28  #include "reduced.h"  #include "reduced.h"
29    
30  // function pointers  /* function pointers */
31  COPY_UPSAMPLED_8X8_16TO8 * copy_upsampled_8x8_16to8;  COPY_UPSAMPLED_8X8_16TO8 * copy_upsampled_8x8_16to8;
32  ADD_UPSAMPLED_8X8_16TO8 * add_upsampled_8x8_16to8;  ADD_UPSAMPLED_8X8_16TO8 * add_upsampled_8x8_16to8;
33  VFILTER_31 * vfilter_31;  VFILTER_31 * vfilter_31;
# Line 66  Line 35 
35  FILTER_18X18_TO_8X8 * filter_18x18_to_8x8;  FILTER_18X18_TO_8X8 * filter_18x18_to_8x8;
36  FILTER_DIFF_18X18_TO_8X8 * filter_diff_18x18_to_8x8;  FILTER_DIFF_18X18_TO_8X8 * filter_diff_18x18_to_8x8;
37    
38  //////////////////////////////////////////////////////////  /*----------------------------------------------------------------------------
39  // Upsampling (1/3/3/1) filter   * Upsampling (1/3/3/1) filter
40     *--------------------------------------------------------------------------*/
41    
42  #define ADD(dst,src)  (dst) = CLIP((dst)+(src), 0, 255)  #define ADD(dst,src)  (dst) = CLIP((dst)+(src), 0, 255)
43    
# Line 163  Line 133 
133  }  }
134  #undef ADD  #undef ADD
135    
136  //////////////////////////////////////////////////////////  /*----------------------------------------------------------------------------
137  // horizontal and vertical deblocking   * horizontal and vertical deblocking
138     *--------------------------------------------------------------------------*/
139    
140  void xvid_HFilter_31_C(uint8_t *Src1, uint8_t *Src2, int Nb_Blks)  void xvid_HFilter_31_C(uint8_t *Src1, uint8_t *Src2, int Nb_Blks)
141  {  {
# Line 190  Line 161 
161    }    }
162  }  }
163    
164  //////////////////////////////////////////////////////////  /*----------------------------------------------------------------------------
165  // 16x16 -> 8x8  (1/3/3/1) downsampling   * 16x16 -> 8x8  (1/3/3/1) downsampling
166  //   *
167  // Warning! These read 1 pixel outside of the input 16x16 block!   * Warning! These read 1 pixel outside of the input 16x16 block!
168  //   *--------------------------------------------------------------------------*/
 //////////////////////////////////////////////////////////  
169    
170  void xvid_Filter_18x18_To_8x8_C(int16_t *Dst, const uint8_t *Src, const int BpS)  void xvid_Filter_18x18_To_8x8_C(int16_t *Dst, const uint8_t *Src, const int BpS)
171  {  {
# Line 240  Line 210 
210      T += 16;      T += 16;
211    }    }
212  }  }
   
 //////////////////////////////////////////////////////////  

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

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