[svn] / branches / release-1_0-branch / xvidcore / src / motion / estimation_common.c Repository:
ViewVC logotype

Diff of /branches/release-1_0-branch/xvidcore/src/motion/estimation_common.c

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

revision 1551, Sun Oct 3 14:49:34 2004 UTC revision 1552, Sun Oct 3 14:52:53 2004 UTC
# Line 21  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   * $Id: estimation_common.c,v 1.2.2.1 2004-04-03 10:17:21 syskin Exp $   * $Id: estimation_common.c,v 1.2.2.2 2004-10-03 14:52:53 syskin Exp $
25   *   *
26   ****************************************************************************/   ****************************************************************************/
27    
# Line 331  Line 331 
331                  if (bDirection & 8) CHECK_CANDIDATE(x, y + iDiamondSize, 8);                  if (bDirection & 8) CHECK_CANDIDATE(x, y + iDiamondSize, 8);
332    
333                  /* now we're doing diagonal checks near our candidate */                  /* now we're doing diagonal checks near our candidate */
   
                 if (*iDirection) {              /* checking if anything found */  
334                          bDirection = *iDirection;                          bDirection = *iDirection;
335                          *iDirection = 0;                  if (*iDirection) {              /* checking if anything found */
336                          x = data->currentMV->x; y = data->currentMV->y;                          x = data->currentMV->x; y = data->currentMV->y;
337                          if (bDirection & 3) {   /* our candidate is left or right */                          if (bDirection & 3) {   /* our candidate is left or right */
338                                  CHECK_CANDIDATE(x, y + iDiamondSize, 8);                                  CHECK_CANDIDATE(x, y + iDiamondSize, 8);
# Line 343  Line 341 
341                                  CHECK_CANDIDATE(x + iDiamondSize, y, 2);                                  CHECK_CANDIDATE(x + iDiamondSize, y, 2);
342                                  CHECK_CANDIDATE(x - iDiamondSize, y, 1);                                  CHECK_CANDIDATE(x - iDiamondSize, y, 1);
343                          }                          }
344                          bDirection += *iDirection;                          bDirection |= *iDirection;
345                          x = data->currentMV->x; y = data->currentMV->y;                          x = data->currentMV->x; y = data->currentMV->y;
346                  }                  }
347          }          }
348          while (*iDirection);          while (bDirection);
349  }  }
350    
351  void  void
Legend:
Removed from v.1551  
changed lines
  Added in v.1552
No admin address has been configured
 ViewVC Help
Powered by ViewVC 1.0.4