[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.7, Sun Nov 17 00:51:11 2002 UTC revision 1.13, Mon Apr 11 14:33:26 2005 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_8TO16SUB2RO_PTR transfer_8to16sub2ro;
38  TRANSFER_16TO8ADD_PTR  transfer_16to8add;  TRANSFER_16TO8ADD_PTR  transfer_16to8add;
39    
40  TRANSFER8X8_COPY_PTR transfer8x8_copy;  TRANSFER8X8_COPY_PTR transfer8x8_copy;
# Line 167  Line 138 
138  }  }
139    
140    
141    void
142    transfer_8to16subro_c(int16_t * const dct,
143                                            const uint8_t * const cur,
144                                            const uint8_t * ref,
145                                            const uint32_t stride)
146    {
147            uint32_t i, j;
148    
149            for (j = 0; j < 8; j++) {
150                    for (i = 0; i < 8; i++) {
151                            uint8_t c = cur[j * stride + i];
152                            uint8_t r = ref[j * stride + i];
153                            dct[j * 8 + i] = (int16_t) c - (int16_t) r;
154                    }
155            }
156    }
157    
158    
159    
160  /*  /*
161   * C   - the current buffer   * C   - the current buffer
162   * R1  - the 1st reference buffer   * R1  - the 1st reference buffer
# Line 177  Line 167 
167   *   *
168   *    R1  (8bit) = R1   *    R1  (8bit) = R1
169   *    R2  (8bit) = R2   *    R2  (8bit) = R2
170   *    C   (8bit) = C   *    R   (temp) = min((R1 + R2)/2, 255)
171   *    DCT (16bit)= C - min((R1 + R2)/2, 255)   *    DCT (16bit)= C - R
172     *    C   (8bit) = R
173   */   */
174  void  void
175  transfer_8to16sub2_c(int16_t * const dct,  transfer_8to16sub2_c(int16_t * const dct,
# Line 197  Line 188 
188                          if (r > 255) {                          if (r > 255) {
189                                  r = 255;                                  r = 255;
190                          }                          }
191                          //cur[j * stride + i] = r;                          cur[j * stride + i] = r;
192                            dct[j * 8 + i] = (int16_t) c - (int16_t) r;
193                    }
194            }
195    }
196    
197    void
198    transfer_8to16sub2ro_c(int16_t * const dct,
199                                             const uint8_t * const cur,
200                                             const uint8_t * ref1,
201                                             const uint8_t * ref2,
202                                             const uint32_t stride)
203    {
204            uint32_t i, j;
205    
206            for (j = 0; j < 8; j++) {
207                    for (i = 0; i < 8; i++) {
208                            uint8_t c = cur[j * stride + i];
209                            int r = (ref1[j * stride + i] + ref2[j * stride + i] + 1) / 2;
210                          dct[j * 8 + i] = (int16_t) c - (int16_t) r;                          dct[j * 8 + i] = (int16_t) c - (int16_t) r;
211                  }                  }
212          }          }
# Line 248  Line 257 
257                                     const uint8_t * const src,                                     const uint8_t * const src,
258                                     const uint32_t stride)                                     const uint32_t stride)
259  {  {
260          uint32_t i, j;          uint32_t j, i;
261    
262          for (j = 0; j < 8; j++) {          for (j = 0; j < 8; ++j) {
263                  for (i = 0; i < 8; i++) {              uint8_t *d = dst + j*stride;
264                          dst[j * stride + i] = src[j * stride + i];                  const uint8_t *s = src + j*stride;
265    
266                    for (i = 0; i < 8; ++i)
267                    {
268                            *d++ = *s++;
269                  }                  }
270          }          }
271  }  }
Legend:
Removed from v.1.7  
changed lines
  Added in v.1.13
No admin address has been configured
 ViewVC Help
Powered by ViewVC 1.0.4