[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.4.2.1, Wed Feb 12 11:44:57 2003 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-2003 Peter Ross <pross@xvid.org>
7     *
8   *  This program is free software ; you can redistribute it and/or modify   *  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   *  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
# Line 17  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   *   *
  ****************************************************************************/  
 /*****************************************************************************  
  *  
  *  History  
  *  
  *  - 14.06.2002 Changed legal header with the new FSF address  
  *      - 14.04.2002 added transfer_8to16sub2  
  *      - 07.01.2002 merge functions from compensate; rename functions  
  *      - 22.12.2001 transfer_8to8add16 limit fix  
  *      - 07.11.2001 initial version; (c)2001 peter ross <pross@cs.rmit.edu.au>  
  *  
22   *  $Id$   *  $Id$
23   *   *
24   ****************************************************************************/   ****************************************************************************/
# Line 43  Line 34 
34  TRANSFER_8TO16SUB_PTR  transfer_8to16sub;  TRANSFER_8TO16SUB_PTR  transfer_8to16sub;
35  TRANSFER_8TO16SUBRO_PTR  transfer_8to16subro;  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 175  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 195  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 246  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.4.2.1  
changed lines
  Added in v.1.13
No admin address has been configured
 ViewVC Help
Powered by ViewVC 1.0.4