Ignore:
Timestamp:
18 Oct 2013, 15:12:55 (11 years ago)
Author:
kwu-htm
Message:

Macro-related fixed.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/HTM-8.2-dev0-KWU/source/Lib/TLibEncoder/TEncCu.cpp

    r640 r641  
    10621062          {
    10631063            xCheckRDCostIntra( rpcBestCU, rpcTempCU, SIZE_2Nx2N );
    1064 #if RATE_CONTROL_LAMBDA_DOMAIN
    1065 #if !M0036_RC_IMPROVEMENT
     1064#if RATE_CONTROL_LAMBDA_DOMAIN && !M0036_RC_IMPROVEMENT
    10661065            if ( uiDepth <= m_addSADDepth )
    10671066            {
     
    10701069            }
    10711070#endif
    1072 #if KWU_RC_MADPRED_E0227
     1071#if RATE_CONTROL_LAMBDA_DOMAIN && M0036_RC_IMPROVEMENT && KWU_RC_MADPRED_E0227
    10731072            if ( uiDepth <= m_addSADDepth )
    10741073            {
     
    10771076            }
    10781077#endif
    1079 #endif
     1078
    10801079#if !RATE_CONTROL_LAMBDA_DOMAIN && KWU_RC_MADPRED_E0227
    10811080            if ( uiDepth <= m_addSADDepth )
     
    23172316  rpcTempCU->getTotalCost() = m_pcRdCost->calcRdCost( rpcTempCU->getTotalBits(), rpcTempCU->getTotalDistortion() );
    23182317 
    2319 #if RATE_CONTROL_LAMBDA_DOMAIN
    2320 #if !M0036_RC_IMPROVEMENT
     2318#if RATE_CONTROL_LAMBDA_DOMAIN && !M0036_RC_IMPROVEMENT
    23212319  UChar uhDepth = rpcTempCU->getDepth( 0 );
    23222320  if ( m_pcEncCfg->getUseRateCtrl() && m_pcEncCfg->getLCULevelRC() && eSize == SIZE_2Nx2N && uhDepth <= m_addSADDepth )
     
    23282326  }
    23292327#endif
    2330 #if KWU_RC_MADPRED_E0227
     2328#if RATE_CONTROL_LAMBDA_DOMAIN && M0036_RC_IMPROVEMENT && KWU_RC_MADPRED_E0227
    23312329  UChar uhDepth = rpcTempCU->getDepth( 0 );
    23322330  if ( m_pcEncCfg->getUseRateCtrl() && m_pcEncCfg->getLCULevelRC() && eSize == SIZE_2Nx2N && uhDepth <= m_addSADDepth )
     
    23372335    m_spatialSAD = (Int)SAD;
    23382336  }
    2339 #endif
    23402337#endif
    23412338#if !RATE_CONTROL_LAMBDA_DOMAIN && KWU_RC_MADPRED_E0227
Note: See TracChangeset for help on using the changeset viewer.