[svn] / branches / dev-api-4 / xvidcore / src / motion / motion_comp.c Repository:
ViewVC logotype

Diff of /branches/dev-api-4/xvidcore/src/motion/motion_comp.c

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

revision 437, Sat Sep 7 09:12:22 2002 UTC revision 677, Tue Nov 26 23:44:11 2002 UTC
# Line 3  Line 3 
3   *  XVID MPEG-4 VIDEO CODEC   *  XVID MPEG-4 VIDEO CODEC
4   *  - Motion Compensation module -   *  - Motion Compensation module -
5   *   *
6   *  Copyright(C) 2002 Michael Militzer <michael@xvid.org>   *  Copyright(C) 2002 Peter Ross <pross@xvid.org>
  *  Copyright(C) 2002 Edouard Gomez <ed.gomez@wanadoo.fr>  
  *  Copyright(C) 2002 Christoph Lampert <gruel@web.de>  
  *  
  *  This program is an implementation of a part of one or more MPEG-4  
  *  Video tools as specified in ISO/IEC 14496-2 standard.  Those intending  
  *  to use this software module in hardware or software products are  
  *  advised that its use may infringe existing patents or copyrights, and  
  *  any such use would be at such party's own risk.  The original  
  *  developer of this software module and his/her company, and subsequent  
  *  editors and their companies, will have no liability for use of this  
  *  software or modifications or derivatives thereof.  
7   *   *
8   *  This program is free software; you can redistribute it and/or modify   *  This file is part of XviD, a free MPEG-4 video encoder/decoder
9   *  it under the terms of the GNU General Public License as published by   *
10     *  XviD is free software; you can redistribute it and/or modify it
11     *  under the terms of the GNU General Public License as published by
12   *  the Free Software Foundation; either version 2 of the License, or   *  the Free Software Foundation; either version 2 of the License, or
13   *  (at your option) any later version.   *  (at your option) any later version.
14   *   *
# Line 30  Line 21 
21   *  along with this program; if not, write to the Free Software   *  along with this program; if not, write to the Free Software
22   *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA   *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
23   *   *
24     *  Under section 8 of the GNU General Public License, the copyright
25     *  holders of XVID explicitly forbid distribution in the following
26     *  countries:
27     *
28     *    - Japan
29     *    - United States of America
30     *
31     *  Linking XviD statically or dynamically with other modules is making a
32     *  combined work based on XviD.  Thus, the terms and conditions of the
33     *  GNU General Public License cover the whole combination.
34     *
35     *  As a special exception, the copyright holders of XviD give you
36     *  permission to link XviD with independent modules that communicate with
37     *  XviD solely through the VFW1.1 and DShow interfaces, regardless of the
38     *  license terms of these independent modules, and to copy and distribute
39     *  the resulting combined work under terms of your choice, provided that
40     *  every copy of the combined work is accompanied by a complete copy of
41     *  the source code of XviD (the version of XviD used to produce the
42     *  combined work), being distributed under the terms of the GNU General
43     *  Public License plus this exception.  An independent module is a module
44     *  which is not derived from or based on XviD.
45     *
46     *  Note that people who make modified versions of XviD are not obligated
47     *  to grant this special exception for their modified versions; it is
48     *  their choice whether to do so.  The GNU General Public License gives
49     *  permission to release a modified version without this exception; this
50     *  exception also makes it possible to release a modified version which
51     *  carries forward this exception.
52     *
53     * $Id: motion_comp.c,v 1.16 2002-11-26 23:44:10 edgomez Exp $
54     *
55   *************************************************************************/   *************************************************************************/
56    
57  #include "../encoder.h"  #include "../encoder.h"
# Line 56  Line 78 
78  {  {
79          int32_t ddx, ddy;          int32_t ddx, ddy;
80    
81          switch (((dx & 1) << 1) + (dy & 1))     // ((dx%2)?2:0)+((dy%2)?1:0)          switch (((dx & 1) << 1) + (dy & 1))     /* ((dx%2)?2:0)+((dy%2)?1:0) */
82          {          {
83          case 0:          case 0:
84                  ddx = dx / 2;                  ddx = dx / 2;
# Line 79  Line 101 
101                                                    refh + (int) ((y + ddy) * stride + x + ddx), stride);                                                    refh + (int) ((y + ddy) * stride + x + ddx), stride);
102                  break;                  break;
103    
104          default:                                        // case 3:          default:                                        /* case 3: */
105                  ddx = (dx - 1) / 2;                  ddx = (dx - 1) / 2;
106                  ddy = (dy - 1) / 2;                  ddy = (dy - 1) / 2;
107                  transfer_8to16sub(dct_codes, cur + y * stride + x,                  transfer_8to16sub(dct_codes, cur + y * stride + x,
# Line 145  Line 167 
167                                                    refv->v + 8 * j * edged_width / 2 + 8 * i,                                                    refv->v + 8 * j * edged_width / 2 + 8 * i,
168                                                    edged_width / 2);                                                    edged_width / 2);
169    
170          } else                                          // mode == MODE_INTER4V          } else                                          /* mode == MODE_INTER4V */
171          {          {
172                  int32_t sum, dx, dy;                  int32_t sum, dx, dy;
173    
Legend:
Removed from v.437  
changed lines
  Added in v.677
No admin address has been configured
 ViewVC Help
Powered by ViewVC 1.0.4