[svn] / trunk / xvidcore / src / motion / estimation_bvop.c Repository:
ViewVC logotype

Diff of /trunk/xvidcore/src/motion/estimation_bvop.c

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

revision 1455, Wed May 26 06:18:43 2004 UTC revision 1456, Wed May 26 09:15:02 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.4 2004-04-22 13:39:33 syskin Exp $   * $Id: estimation_bvop.c,v 1.5 2004-05-26 09:15:02 edgomez Exp $
25   *   *
26   ****************************************************************************/   ****************************************************************************/
27    
# Line 611  Line 611 
611                          return *Data->iMinSAD; /* skipped */                          return *Data->iMinSAD; /* skipped */
612          }          }
613    
         *Data->iMinSAD += Data->lambda16;  
614          skip_sad = 4*MAX(MAX(Data->iMinSAD[1],Data->iMinSAD[2]), MAX(Data->iMinSAD[3],Data->iMinSAD[4]));          skip_sad = 4*MAX(MAX(Data->iMinSAD[1],Data->iMinSAD[2]), MAX(Data->iMinSAD[3],Data->iMinSAD[4]));
615          if (Data->chroma) skip_sad += Data->chromaSAD;          if (Data->chroma) skip_sad += Data->chromaSAD;
616    
# Line 627  Line 626 
626                  xvid_me_SubpelRefine(Data, CheckCandidate, 0);                  xvid_me_SubpelRefine(Data, CheckCandidate, 0);
627          }          }
628    
629            *Data->iMinSAD += Data->lambda16;
630          *best_sad = *Data->iMinSAD;          *best_sad = *Data->iMinSAD;
631    
632          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.1455  
changed lines
  Added in v.1456

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