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

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

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

revision 1142, Wed Sep 10 22:19:00 2003 UTC revision 1160, Tue Sep 30 18:20:31 2003 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_pvop.c,v 1.1.2.1 2003-09-10 22:18:59 edgomez Exp $   * $Id: estimation_pvop.c,v 1.1.2.2 2003-09-30 18:20:31 edgomez Exp $
25   *   *
26   ****************************************************************************/   ****************************************************************************/
27    
# Line 590  Line 590 
590                          pMB->pmvs[0].y = Data->currentMV[0].y - Data->predMV.y;                          pMB->pmvs[0].y = Data->currentMV[0].y - Data->predMV.y;
591                  }                  }
592    
593          } else if (mode == MODE_INTER ) { // but mcsel == 1          } else if (mode == MODE_INTER ) { /* but mcsel == 1 */
594    
595                  pMB->mcsel = 1;                  pMB->mcsel = 1;
596                  if (Data->qpel) {                  if (Data->qpel) {
# Line 836  Line 836 
836          else {          else {
837    
838                  MainSearchFunc * MainSearchPtr;                  MainSearchFunc * MainSearchPtr;
839                  int mask = make_mask(pmv, i, *Data->dir); // all vectors pmv[0..i-1] have been checked                  int mask = make_mask(pmv, i, *Data->dir); /* all vectors pmv[0..i-1] have been checked */
840    
841                  if (MotionFlags & XVID_ME_USESQUARES16) MainSearchPtr = xvid_me_SquareSearch;                  if (MotionFlags & XVID_ME_USESQUARES16) MainSearchPtr = xvid_me_SquareSearch;
842                  else if (MotionFlags & XVID_ME_ADVANCEDDIAMOND16) MainSearchPtr = xvid_me_AdvDiamondSearch;                  else if (MotionFlags & XVID_ME_ADVANCEDDIAMOND16) MainSearchPtr = xvid_me_AdvDiamondSearch;

Legend:
Removed from v.1142  
changed lines
  Added in v.1160

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