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

Diff of /trunk/xvidcore/src/encoder.c

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

revision 677, Tue Nov 26 23:44:11 2002 UTC revision 686, Thu Nov 28 07:27:37 2002 UTC
# Line 52  Line 52 
52   *  exception also makes it possible to release a modified version which   *  exception also makes it possible to release a modified version which
53   *  carries forward this exception.   *  carries forward this exception.
54   *   *
55   * $Id: encoder.c,v 1.88 2002-11-26 23:44:09 edgomez Exp $   * $Id: encoder.c,v 1.89 2002-11-28 07:27:37 suxen_drol Exp $
56   *   *
57   ****************************************************************************/   ****************************************************************************/
58    
# Line 78  Line 78 
78  #include "quant/quant_matrix.h"  #include "quant/quant_matrix.h"
79  #include "utils/mem_align.h"  #include "utils/mem_align.h"
80    
 #ifdef _SMP  
 #include "motion/smp_motion_est.h"  
 #endif  
81  /*****************************************************************************  /*****************************************************************************
82   * Local macros   * Local macros
83   ****************************************************************************/   ****************************************************************************/
# Line 239  Line 236 
236    
237          pEnc->mbParam.m_quant_type = H263_QUANT;          pEnc->mbParam.m_quant_type = H263_QUANT;
238    
 #ifdef _SMP  
         pEnc->mbParam.num_threads = MIN(pParam->num_threads, MAXNUMTHREADS);  
 #endif  
   
239          pEnc->sStat.fMvPrevSigma = -1;          pEnc->sStat.fMvPrevSigma = -1;
240    
241          /* Fill rate control parameters */          /* Fill rate control parameters */
# Line 932  Line 925 
925                  HintedMESet(pEnc, &bIntra);                  HintedMESet(pEnc, &bIntra);
926          } else {          } else {
927    
 #ifdef _SMP  
         if (pEnc->mbParam.num_threads > 1)  
                 bIntra =  
                         SMP_MotionEstimation(&pEnc->mbParam, pEnc->current, pEnc->reference,  
                                                  &pEnc->vInterH, &pEnc->vInterV, &pEnc->vInterHV,  
                                                  iLimit);  
         else  
 #endif  
928                  bIntra =                  bIntra =
929                          MotionEstimation(&pEnc->mbParam, pEnc->current, pEnc->reference,                          MotionEstimation(&pEnc->mbParam, pEnc->current, pEnc->reference,
930                           &pEnc->vInterH, &pEnc->vInterV, &pEnc->vInterHV,                           &pEnc->vInterH, &pEnc->vInterV, &pEnc->vInterHV,

Legend:
Removed from v.677  
changed lines
  Added in v.686

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