[cvs] / xvidcore / src / prediction / mbprediction.h Repository:
ViewVC logotype

Diff of /xvidcore/src/prediction/mbprediction.h

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

revision 1.16, Sat Oct 19 12:20:33 2002 UTC revision 1.18, Tue Nov 26 23:44:11 2002 UTC
# Line 6  Line 6 
6   *  Copyright(C) 2002 Christoph Lampert <gruel@web.de>   *  Copyright(C) 2002 Christoph Lampert <gruel@web.de>
7   *               2002 Peter Ross <pross@xvid.org>   *               2002 Peter Ross <pross@xvid.org>
8   *   *
9   *  This program is an implementation of a part of one or more MPEG-4   *  This file is part of XviD, a free MPEG-4 video encoder/decoder
10   *  Video tools as specified in ISO/IEC 14496-2 standard.  Those intending   *
11   *  to use this software module in hardware or software products are   *  XviD is free software; you can redistribute it and/or modify it
12   *  advised that its use may infringe existing patents or copyrights, and   *  under the terms of the GNU General Public License as published by
13   *  any such use would be at such party's own risk.  The original   *  the Free Software Foundation; either version 2 of the License, or
  *  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.  
  *  
  *  This program is free software; you can redistribute it and/or modify  
  *  it under the terms of the GNU General Public License as published by  
  *  the xvid_free Software Foundation; either version 2 of the License, or  
14   *  (at your option) any later version.   *  (at your option) any later version.
15   *   *
16   *  This program is distributed in the hope that it will be useful,   *  This program is distributed in the hope that it will be useful,
# Line 26  Line 19 
19   *  GNU General Public License for more details.   *  GNU General Public License for more details.
20   *   *
21   *  You should have received a copy of the GNU General Public License   *  You should have received a copy of the GNU General Public License
22   *  along with this program; if not, write to the xvid_free Software   *  along with this program; if not, write to the Free Software
23   *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.   *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
24     *
25     *  Under section 8 of the GNU General Public License, the copyright
26     *  holders of XVID explicitly forbid distribution in the following
27     *  countries:
28     *
29     *    - Japan
30     *    - United States of America
31     *
32     *  Linking XviD statically or dynamically with other modules is making a
33     *  combined work based on XviD.  Thus, the terms and conditions of the
34     *  GNU General Public License cover the whole combination.
35     *
36     *  As a special exception, the copyright holders of XviD give you
37     *  permission to link XviD with independent modules that communicate with
38     *  XviD solely through the VFW1.1 and DShow interfaces, regardless of the
39     *  license terms of these independent modules, and to copy and distribute
40     *  the resulting combined work under terms of your choice, provided that
41     *  every copy of the combined work is accompanied by a complete copy of
42     *  the source code of XviD (the version of XviD used to produce the
43     *  combined work), being distributed under the terms of the GNU General
44     *  Public License plus this exception.  An independent module is a module
45     *  which is not derived from or based on XviD.
46     *
47     *  Note that people who make modified versions of XviD are not obligated
48     *  to grant this special exception for their modified versions; it is
49     *  their choice whether to do so.  The GNU General Public License gives
50     *  permission to release a modified version without this exception; this
51     *  exception also makes it possible to release a modified version which
52     *  carries forward this exception.
53   *   *
54   *  $Id$   *  $Id$
55   *   *
# Line 293  Line 315 
315          if (num_cand == 1) {          if (num_cand == 1) {
316                  pmv[0] = pmv[last_cand];                  pmv[0] = pmv[last_cand];
317                  psad[0] = psad[last_cand];                  psad[0] = psad[last_cand];
318          // return MVequal(pmv[0], zeroMV); /* no point calculating median mv and minimum sad */          /* return MVequal(pmv[0], zeroMV);  no point calculating median mv and minimum sad  */
319    
320                  /* original pmvdata() compatibility hack */                  /* original pmvdata() compatibility hack */
321                  return y==0 && block <= 1 ? 0 : MVequal(pmv[0], zeroMV);                  return y==0 && block <= 1 ? 0 : MVequal(pmv[0], zeroMV);
# Line 304  Line 326 
326                  psad[0] = MIN(MIN(psad[1], psad[2]), psad[3]);                  psad[0] = MIN(MIN(psad[1], psad[2]), psad[3]);
327                  return 1;                  return 1;
328                  /* compatibility patch */                  /* compatibility patch */
329                  //return y==0 && block <= 1 ? 0 : 1;                  /*return y==0 && block <= 1 ? 0 : 1; */
330          }          }
331    
332          /* set median, minimum */          /* set median, minimum */
# Line 496  Line 518 
518          if (num_cand == 1) {          if (num_cand == 1) {
519                  pmv[0] = pmv[last_cand];                  pmv[0] = pmv[last_cand];
520                  psad[0] = psad[last_cand];                  psad[0] = psad[last_cand];
521          // return MVequal(pmv[0], zeroMV); /* no point calculating median mv and minimum sad */          /* return MVequal(pmv[0], zeroMV); no point calculating median mv and minimum sad */
522    
523                  /* original pmvdata() compatibility hack */                  /* original pmvdata() compatibility hack */
524                  return y==0 && block <= 1 ? 0 : MVequal(pmv[0], zeroMV);                  return y==0 && block <= 1 ? 0 : MVequal(pmv[0], zeroMV);
# Line 507  Line 529 
529                  psad[0] = MIN(MIN(psad[1], psad[2]), psad[3]);                  psad[0] = MIN(MIN(psad[1], psad[2]), psad[3]);
530                  return 1;                  return 1;
531                  /* compatibility patch */                  /* compatibility patch */
532                  //return y==0 && block <= 1 ? 0 : 1;                  /*return y==0 && block <= 1 ? 0 : 1; */
533          }          }
534    
535          /* set median, minimum */          /* set median, minimum */

Legend:
Removed from v.1.16  
changed lines
  Added in v.1.18

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