[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.14, Sat Sep 7 13:43:00 2002 UTC revision 1.17, Sun Nov 17 00:35:33 2002 UTC
# Line 3  Line 3 
3   *  XVID MPEG-4 VIDEO CODEC   *  XVID MPEG-4 VIDEO CODEC
4   *  -  MB prediction header file  -   *  -  MB prediction header file  -
5   *   *
6   *  This program is an implementation of a part of one or more MPEG-4   *  Copyright(C) 2002 Christoph Lampert <gruel@web.de>
7   *  Video tools as specified in ISO/IEC 14496-2 standard.  Those intending   *               2002 Peter Ross <pross@xvid.org>
8   *  to use this software module in hardware or software products are   *
9   *  advised that its use may infringe existing patents or copyrights, and   *  This file is part of XviD, a free MPEG-4 video encoder/decoder
10   *  any such use would be at such party's own risk.  The original   *
11   *  developer of this software module and his/her company, and subsequent   *  XviD is free software; you can redistribute it and/or modify it
12   *  editors and their companies, will have no liability for use of this   *  under the terms of the GNU General Public License as published by
13   *  software or modifications or derivatives thereof.   *  the Free Software Foundation; either version 2 of the License, or
  *  
  *  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 23  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 138  Line 163 
163      lpos = lx + ly * mb_width;      lpos = lx + ly * mb_width;
164      rpos = rx + ry * mb_width;      rpos = rx + ry * mb_width;
165      tpos = tx + ty * mb_width;      tpos = tx + ty * mb_width;
166      num_cand = 0;      last_cand = num_cand = 0;
167    
168      if (lpos >= bound && lx >= 0) {      if (lpos >= bound && lx >= 0) {
169          num_cand++;          num_cand++;
# Line 164  Line 189 
189          pmv[3] = zeroMV;          pmv[3] = zeroMV;
190      }      }
191    
192      /* if only one valid candidate predictor, the invalid candiates are set to the canidate */      /*
193             * If there're more than one candidate, we return the median vector
194             * edgomez : the special case "no candidates" is handled the same way
195             *           because all vectors are set to zero. So the median vector
196             *           is {0,0}, and this is exactly the vector we must return
197             *           according to the mpeg4 specs.
198             */
199    
200          if (num_cand != 1) {          if (num_cand != 1) {
201                  /* set median */                  /* set median */
202    
# Line 238  Line 270 
270      lpos = lx + ly * mb_width;      lpos = lx + ly * mb_width;
271      rpos = rx + ry * mb_width;      rpos = rx + ry * mb_width;
272      tpos = tx + ty * mb_width;      tpos = tx + ty * mb_width;
273      num_cand = 0;      last_cand = num_cand = 0;
274    
275      if (lpos >= bound && lx >= 0) {      if (lpos >= bound && lx >= 0) {
276          num_cand++;          num_cand++;
# Line 356  Line 388 
388      lpos = lx + ly * mb_width;      lpos = lx + ly * mb_width;
389      rpos = rx + ry * mb_width;      rpos = rx + ry * mb_width;
390      tpos = tx + ty * mb_width;      tpos = tx + ty * mb_width;
391      num_cand = 0;      last_cand = num_cand = 0;
392    
393      if (lpos >= bound && lx >= 0) {      if (lpos >= bound && lx >= 0) {
394          num_cand++;          num_cand++;
# Line 441  Line 473 
473      lpos = lx + ly * mb_width;      lpos = lx + ly * mb_width;
474      rpos = rx + ry * mb_width;      rpos = rx + ry * mb_width;
475      tpos = tx + ty * mb_width;      tpos = tx + ty * mb_width;
476      num_cand = 0;      last_cand = num_cand = 0;
477    
478      if (lpos >= bound && lx >= 0) {      if (lpos >= bound && lx >= 0) {
479          num_cand++;          num_cand++;

Legend:
Removed from v.1.14  
changed lines
  Added in v.1.17

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