Ignore:
Timestamp:
16 Oct 2013, 11:27:16 (11 years ago)
Author:
kwu-htm
Message:

Clean-up version of JCT3V-E0227.

File:
1 edited

Legend:

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

    r635 r636  
    242242 
    243243  m_bUseSBACRD        = pcEncTop->getUseSBACRD();
     244
     245#if KWU_RC_MADPRED_E0227
    244246  if(!pcEncTop->getIsDepth())
     247  {
    245248    m_pcRateCtrl        = pcEncTop->getRateCtrl();
     249  }
    246250  else
    247251  {
    248252    m_pcRateCtrl = NULL;
    249253  }
     254#else
     255  m_pcRateCtrl        = pcEncTop->getRateCtrl();
     256#endif
    250257}
    251258
     
    21242131#endif
    21252132
    2126 #if RATE_CONTROL_LAMBDA_DOMAIN  && !M0036_RC_IMPROVEMENT
    2127 #if KWU_RC_MADPRED_E0227
     2133#if RATE_CONTROL_LAMBDA_DOMAIN  && (!M0036_RC_IMPROVEMENT || KWU_RC_MADPRED_E0227)
    21282134  if ( m_pcEncCfg->getUseRateCtrl() && m_pcEncCfg->getLCULevelRC() && ePartSize == SIZE_2Nx2N && uhDepth <= m_addSADDepth )
    21292135  {
     
    21332139    m_temporalSAD = (Int)SAD;
    21342140  }
    2135 #endif
    21362141#endif
    21372142#if !RATE_CONTROL_LAMBDA_DOMAIN  && KWU_RC_MADPRED_E0227
     
    22682273  rpcTempCU->getTotalCost() = m_pcRdCost->calcRdCost( rpcTempCU->getTotalBits(), rpcTempCU->getTotalDistortion() );
    22692274 
    2270 #if RATE_CONTROL_LAMBDA_DOMAIN && !M0036_RC_IMPROVEMENT
    2271 #if KWU_RC_MADPRED_E0227
     2275#if RATE_CONTROL_LAMBDA_DOMAIN && (!M0036_RC_IMPROVEMENT || KWU_RC_MADPRED_E0227)
    22722276  UChar uhDepth = rpcTempCU->getDepth( 0 );
    22732277  if ( m_pcEncCfg->getUseRateCtrl() && m_pcEncCfg->getLCULevelRC() && eSize == SIZE_2Nx2N && uhDepth <= m_addSADDepth )
     
    22782282    m_spatialSAD = (Int)SAD;
    22792283  }
    2280 #endif
    22812284#endif
    22822285#if !RATE_CONTROL_LAMBDA_DOMAIN && KWU_RC_MADPRED_E0227
Note: See TracChangeset for help on using the changeset viewer.