[cvs] / xvidcore / src / utils / mem_transfer.c Repository:
ViewVC logotype

Diff of /xvidcore/src/utils/mem_transfer.c

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

revision 1.8, Tue Nov 26 23:44:11 2002 UTC revision 1.10, Mon Mar 22 22:36:24 2004 UTC
# Line 3  Line 3 
3   *  XVID MPEG-4 VIDEO CODEC   *  XVID MPEG-4 VIDEO CODEC
4   *  - 8bit<->16bit transfer -   *  - 8bit<->16bit transfer -
5   *   *
6   *  Copyright(C) 2001-2002 Peter Ross <pross@xvid.org>   *  Copyright(C) 2001-2003 Peter Ross <pross@xvid.org>
7   *   *
8   *  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
9   *   *  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  
10   *  the Free Software Foundation; either version 2 of the License, or   *  the Free Software Foundation; either version 2 of the License, or
11   *  (at your option) any later version.   *  (at your option) any later version.
12   *   *
# 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   *   *
  *  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.  
  *  
22   * $Id$   * $Id$
23   *   *
24   ****************************************************************************/   ****************************************************************************/
# Line 63  Line 32 
32  TRANSFER_16TO8COPY_PTR transfer_16to8copy;  TRANSFER_16TO8COPY_PTR transfer_16to8copy;
33    
34  TRANSFER_8TO16SUB_PTR  transfer_8to16sub;  TRANSFER_8TO16SUB_PTR  transfer_8to16sub;
35    TRANSFER_8TO16SUBRO_PTR  transfer_8to16subro;
36  TRANSFER_8TO16SUB2_PTR transfer_8to16sub2;  TRANSFER_8TO16SUB2_PTR transfer_8to16sub2;
37  TRANSFER_16TO8ADD_PTR  transfer_16to8add;  TRANSFER_16TO8ADD_PTR  transfer_16to8add;
38    
# Line 167  Line 137 
137  }  }
138    
139    
140    void
141    transfer_8to16subro_c(int16_t * const dct,
142                                            const uint8_t * const cur,
143                                            const uint8_t * ref,
144                                            const uint32_t stride)
145    {
146            uint32_t i, j;
147    
148            for (j = 0; j < 8; j++) {
149                    for (i = 0; i < 8; i++) {
150                            uint8_t c = cur[j * stride + i];
151                            uint8_t r = ref[j * stride + i];
152                            dct[j * 8 + i] = (int16_t) c - (int16_t) r;
153                    }
154            }
155    }
156    
157    
158    
159  /*  /*
160   * C   - the current buffer   * C   - the current buffer
161   * R1  - the 1st reference buffer   * R1  - the 1st reference buffer
# Line 177  Line 166 
166   *   *
167   *    R1  (8bit) = R1   *    R1  (8bit) = R1
168   *    R2  (8bit) = R2   *    R2  (8bit) = R2
169   *    C   (8bit) = C   *    R   (temp) = min((R1 + R2)/2, 255)
170   *    DCT (16bit)= C - min((R1 + R2)/2, 255)   *    DCT (16bit)= C - R
171     *    C   (8bit) = R
172   */   */
173  void  void
174  transfer_8to16sub2_c(int16_t * const dct,  transfer_8to16sub2_c(int16_t * const dct,
# Line 197  Line 187 
187                          if (r > 255) {                          if (r > 255) {
188                                  r = 255;                                  r = 255;
189                          }                          }
190                          /*cur[j * stride + i] = r; */                          cur[j * stride + i] = r;
191                          dct[j * 8 + i] = (int16_t) c - (int16_t) r;                          dct[j * 8 + i] = (int16_t) c - (int16_t) r;
192                  }                  }
193          }          }
Legend:
Removed from v.1.8  
changed lines
  Added in v.1.10
No admin address has been configured
 ViewVC Help
Powered by ViewVC 1.0.4