[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 715, Sat Dec 14 06:07:03 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.31 2002-12-14 06:07:02 suxen_drol Exp $
43   *   *
44   ****************************************************************************/   ****************************************************************************/
45    
# Line 1608  Line 1608 
1608          if ((pEnc->current->global_flags & XVID_REDUCED))          if ((pEnc->current->global_flags & XVID_REDUCED))
1609          {          {
1610                  image_deblock_rrv(&pEnc->current->image, pEnc->mbParam.edged_width,                  image_deblock_rrv(&pEnc->current->image, pEnc->mbParam.edged_width,
1611                          pEnc->current->mbs, mb_width, mb_height, pEnc->mbParam.mb_width);                          pEnc->current->mbs, mb_width, mb_height, pEnc->mbParam.mb_width,
1612                            16, XVID_DEC_DEBLOCKY|XVID_DEC_DEBLOCKUV);
1613          }          }
1614          emms();          emms();
1615    
# Line 1690  Line 1691 
1691                  pEnc->current->coding_type = P_VOP;                  pEnc->current->coding_type = P_VOP;
1692    
1693          start_timer();          start_timer();
1694          if (pEnc->current->global_flags & XVID_HINTEDME_SET) {          if (pEnc->current->global_flags & XVID_HINTEDME_SET)
1695                  HintedMESet(pEnc, &bIntra);                  HintedMESet(pEnc, &bIntra);
1696          if (bIntra == 0) {          else
                         MotionEstimationHinted(&pEnc->mbParam, pEnc->current, pEnc->reference,  
                                                                                         &pEnc->vInterH, &pEnc->vInterV, &pEnc->vInterHV);  
                 }  
   
         } else {  
1697    
1698                  bIntra =                  bIntra =
1699                          MotionEstimation(&pEnc->mbParam, pEnc->current, pEnc->reference,                          MotionEstimation(&pEnc->mbParam, pEnc->current, pEnc->reference,
1700                           &pEnc->vInterH, &pEnc->vInterV, &pEnc->vInterHV,                           &pEnc->vInterH, &pEnc->vInterV, &pEnc->vInterHV,
1701                           iLimit);                           iLimit);
1702          }  
1703          stop_motion_timer();          stop_motion_timer();
1704    
1705          if (bIntra == 1) return FrameCodeI(pEnc, bs, pBits);          if (bIntra == 1) return FrameCodeI(pEnc, bs, pBits);
# Line 1853  Line 1849 
1849          if ((pEnc->current->global_flags & XVID_REDUCED))          if ((pEnc->current->global_flags & XVID_REDUCED))
1850          {          {
1851                  image_deblock_rrv(&pEnc->current->image, pEnc->mbParam.edged_width,                  image_deblock_rrv(&pEnc->current->image, pEnc->mbParam.edged_width,
1852                          pEnc->current->mbs, mb_width, mb_height, pEnc->mbParam.mb_width);                          pEnc->current->mbs, mb_width, mb_height, pEnc->mbParam.mb_width,
1853                            16, XVID_DEC_DEBLOCKY|XVID_DEC_DEBLOCKUV);
1854          }          }
1855    
1856          emms();          emms();
Legend:
Removed from v.709  
changed lines
  Added in v.715
No admin address has been configured
 ViewVC Help
Powered by ViewVC 1.0.4