[svn] / branches / dev-api-3 / xvidcore / src / encoder.c Repository:
ViewVC logotype

Diff of /branches/dev-api-3/xvidcore/src/encoder.c

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

revision 709, Thu Dec 12 12:42:31 2002 UTC revision 711, Fri Dec 13 11:54:17 2002 UTC
# Line 39  Line 39 
39   *             MinChen <chenm001@163.com>   *             MinChen <chenm001@163.com>
40   *  14.04.2002 added FrameCodeB()   *  14.04.2002 added FrameCodeB()
41   *   *
42   *  $Id: encoder.c,v 1.76.2.29 2002-12-12 12:42:31 suxen_drol Exp $   *  $Id: encoder.c,v 1.76.2.30 2002-12-13 11:54:17 syskin Exp $
43   *   *
44   ****************************************************************************/   ****************************************************************************/
45    
# Line 1690  Line 1690 
1690                  pEnc->current->coding_type = P_VOP;                  pEnc->current->coding_type = P_VOP;
1691    
1692          start_timer();          start_timer();
1693          if (pEnc->current->global_flags & XVID_HINTEDME_SET) {          if (pEnc->current->global_flags & XVID_HINTEDME_SET)
1694                  HintedMESet(pEnc, &bIntra);                  HintedMESet(pEnc, &bIntra);
1695          if (bIntra == 0) {          else
                         MotionEstimationHinted(&pEnc->mbParam, pEnc->current, pEnc->reference,  
                                                                                         &pEnc->vInterH, &pEnc->vInterV, &pEnc->vInterHV);  
                 }  
   
         } else {  
1696    
1697                  bIntra =                  bIntra =
1698                          MotionEstimation(&pEnc->mbParam, pEnc->current, pEnc->reference,                          MotionEstimation(&pEnc->mbParam, pEnc->current, pEnc->reference,
1699                           &pEnc->vInterH, &pEnc->vInterV, &pEnc->vInterHV,                           &pEnc->vInterH, &pEnc->vInterV, &pEnc->vInterHV,
1700                           iLimit);                           iLimit);
1701          }  
1702          stop_motion_timer();          stop_motion_timer();
1703    
1704          if (bIntra == 1) return FrameCodeI(pEnc, bs, pBits);          if (bIntra == 1) return FrameCodeI(pEnc, bs, pBits);

Legend:
Removed from v.709  
changed lines
  Added in v.711

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