Changeset 637 in 3DVCSoftware for branches/HTM-8.2-dev0-KWU/source/Lib/TLibEncoder/TEncCu.cpp

Timestamp:

17 Oct 2013, 20:17:10 (12 years ago)

Author:

kwu-htm

Message:

Clean up and revised according to the guideline.

File:

• branches/HTM-8.2-dev0-KWU/source/Lib/TLibEncoder/TEncCu.cpp (modified) (7 diffs)

branches/HTM-8.2-dev0-KWU/source/Lib/TLibEncoder/TEncCu.cpp

@@ -103 +103 @@
   
   m_bEncodeDQP = false;
-#if (RATE_CONTROL_LAMBDA_DOMAIN && !M0036_RC_IMPROVEMENT) || KWU_RC_MADPRED_E0227
+#if RATE_CONTROL_LAMBDA_DOMAIN && (!M0036_RC_IMPROVEMENT || KWU_RC_MADPRED_E0227)
   m_LCUPredictionSAD = 0;
   m_addSADDepth      = 0;
@@ -242 +242 @@
   
   m_bUseSBACRD        = pcEncTop->getUseSBACRD();
-
-#if KWU_RC_MADPRED_E0227
-  if(!pcEncTop->getIsDepth())
-  {
-    m_pcRateCtrl        = pcEncTop->getRateCtrl();
-  }
-  else
-  {
-    m_pcRateCtrl = NULL;
-  }
-#else
   m_pcRateCtrl        = pcEncTop->getRateCtrl();
-#endif
 }
 
@@ -478 +466 @@
 
 #if RATE_CONTROL_LAMBDA_DOMAIN
-  if ( m_pcEncCfg->getUseRateCtrl() && !m_pcEncCfg->getIsDepth() )
+  if ( m_pcEncCfg->getUseRateCtrl() )
   {
     iMinQP = m_pcRateCtrl->getRCQP();
@@ -484 +472 @@
   }
 #else
-  if(m_pcEncCfg->getUseRateCtrl() && !m_pcEncCfg->getIsDepth())
+  if(m_pcEncCfg->getUseRateCtrl())
   {
     Int qp = m_pcRateCtrl->getUnitQP();
@@ -692 +680 @@
     }
 #endif
-#if !RATE_CONTROL_LAMBDA_DOMAIN
+#if !RATE_CONTROL_LAMBDA_DOMAIN && KWU_FIX_URQ
     if(m_pcEncCfg->getUseRateCtrl())
     {
@@ -1175 +1163 @@
   }
 #if RATE_CONTROL_LAMBDA_DOMAIN
-  if ( m_pcEncCfg->getUseRateCtrl() && !m_pcEncCfg->getIsDepth() )
+  if ( m_pcEncCfg->getUseRateCtrl() )
   {
     iMinQP = m_pcRateCtrl->getRCQP();
@@ -1181 +1169 @@
   }
 #else
-  if(m_pcEncCfg->getUseRateCtrl() && !m_pcEncCfg->getIsDepth())
+  if(m_pcEncCfg->getUseRateCtrl())
   {
     Int qp = m_pcRateCtrl->getUnitQP();