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

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

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

revision 1451, Fri May 21 14:40:15 2004 UTC revision 1452, Tue May 25 14:14:55 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_bvop.c,v 1.2 2004-03-22 22:36:24 edgomez Exp $   * $Id: estimation_bvop.c,v 1.2.2.1 2004-05-25 14:14:55 syskin Exp $
25   *   *
26   ****************************************************************************/   ****************************************************************************/
27    
# Line 678  Line 678 
678                  if (pMB->mode == MODE_DIRECT_NONE_MV) return *Data->iMinSAD; /* skipped */                  if (pMB->mode == MODE_DIRECT_NONE_MV) return *Data->iMinSAD; /* skipped */
679          }          }
680    
         *Data->iMinSAD += Data->lambda16;  
681          skip_sad = *Data->iMinSAD;          skip_sad = *Data->iMinSAD;
682    
683          if (!(MotionFlags & XVID_ME_SKIP_DELTASEARCH)) {          if (!(MotionFlags & XVID_ME_SKIP_DELTASEARCH)) {
# Line 691  Line 690 
690                  xvid_me_SubpelRefine(Data, CheckCandidate);                  xvid_me_SubpelRefine(Data, CheckCandidate);
691          }          }
692    
693            *Data->iMinSAD += Data->lambda16;
694          *best_sad = *Data->iMinSAD;          *best_sad = *Data->iMinSAD;
695    
696          if (Data->qpel || b_mb->mode == MODE_INTER4V) pMB->mode = MODE_DIRECT;          if (Data->qpel || b_mb->mode == MODE_INTER4V) pMB->mode = MODE_DIRECT;
Legend:
Removed from v.1451  
changed lines
  Added in v.1452
No admin address has been configured
 ViewVC Help
Powered by ViewVC 1.0.4