Ignore:
Timestamp:
17 Oct 2013, 20:17:10 (11 years ago)
Author:
kwu-htm
Message:

Clean up and revised according to the guideline.

File:
1 edited

Legend:

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

    r636 r637  
    103103 
    104104  m_bEncodeDQP = false;
    105 #if (RATE_CONTROL_LAMBDA_DOMAIN && !M0036_RC_IMPROVEMENT) || KWU_RC_MADPRED_E0227
     105#if RATE_CONTROL_LAMBDA_DOMAIN && (!M0036_RC_IMPROVEMENT || KWU_RC_MADPRED_E0227)
    106106  m_LCUPredictionSAD = 0;
    107107  m_addSADDepth      = 0;
     
    242242 
    243243  m_bUseSBACRD        = pcEncTop->getUseSBACRD();
    244 
    245 #if KWU_RC_MADPRED_E0227
    246   if(!pcEncTop->getIsDepth())
    247   {
    248     m_pcRateCtrl        = pcEncTop->getRateCtrl();
    249   }
    250   else
    251   {
    252     m_pcRateCtrl = NULL;
    253   }
    254 #else
    255244  m_pcRateCtrl        = pcEncTop->getRateCtrl();
    256 #endif
    257245}
    258246
     
    478466
    479467#if RATE_CONTROL_LAMBDA_DOMAIN
    480   if ( m_pcEncCfg->getUseRateCtrl() && !m_pcEncCfg->getIsDepth() )
     468  if ( m_pcEncCfg->getUseRateCtrl() )
    481469  {
    482470    iMinQP = m_pcRateCtrl->getRCQP();
     
    484472  }
    485473#else
    486   if(m_pcEncCfg->getUseRateCtrl() && !m_pcEncCfg->getIsDepth())
     474  if(m_pcEncCfg->getUseRateCtrl())
    487475  {
    488476    Int qp = m_pcRateCtrl->getUnitQP();
     
    692680    }
    693681#endif
    694 #if !RATE_CONTROL_LAMBDA_DOMAIN
     682#if !RATE_CONTROL_LAMBDA_DOMAIN && KWU_FIX_URQ
    695683    if(m_pcEncCfg->getUseRateCtrl())
    696684    {
     
    11751163  }
    11761164#if RATE_CONTROL_LAMBDA_DOMAIN
    1177   if ( m_pcEncCfg->getUseRateCtrl() && !m_pcEncCfg->getIsDepth() )
     1165  if ( m_pcEncCfg->getUseRateCtrl() )
    11781166  {
    11791167    iMinQP = m_pcRateCtrl->getRCQP();
     
    11811169  }
    11821170#else
    1183   if(m_pcEncCfg->getUseRateCtrl() && !m_pcEncCfg->getIsDepth())
     1171  if(m_pcEncCfg->getUseRateCtrl())
    11841172  {
    11851173    Int qp = m_pcRateCtrl->getUnitQP();
Note: See TracChangeset for help on using the changeset viewer.