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

Timestamp:

16 Oct 2013, 11:27:16 (12 years ago)

Author:

kwu-htm

Message:

Clean-up version of JCT3V-E0227.

File:

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

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

@@ -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
 }
 
@@ -2124 +2131 @@
 #endif
 
-#if RATE_CONTROL_LAMBDA_DOMAIN  && !M0036_RC_IMPROVEMENT
-#if KWU_RC_MADPRED_E0227
+#if RATE_CONTROL_LAMBDA_DOMAIN  && (!M0036_RC_IMPROVEMENT || KWU_RC_MADPRED_E0227)
   if ( m_pcEncCfg->getUseRateCtrl() && m_pcEncCfg->getLCULevelRC() && ePartSize == SIZE_2Nx2N && uhDepth <= m_addSADDepth )
   {
@@ -2133 +2139 @@
     m_temporalSAD = (Int)SAD;
   }
-#endif
 #endif
 #if !RATE_CONTROL_LAMBDA_DOMAIN  && KWU_RC_MADPRED_E0227
@@ -2268 +2273 @@
   rpcTempCU->getTotalCost() = m_pcRdCost->calcRdCost( rpcTempCU->getTotalBits(), rpcTempCU->getTotalDistortion() );
   
-#if RATE_CONTROL_LAMBDA_DOMAIN && !M0036_RC_IMPROVEMENT
-#if KWU_RC_MADPRED_E0227
+#if RATE_CONTROL_LAMBDA_DOMAIN && (!M0036_RC_IMPROVEMENT || KWU_RC_MADPRED_E0227)
   UChar uhDepth = rpcTempCU->getDepth( 0 );
   if ( m_pcEncCfg->getUseRateCtrl() && m_pcEncCfg->getLCULevelRC() && eSize == SIZE_2Nx2N && uhDepth <= m_addSADDepth )
@@ -2278 +2282 @@
     m_spatialSAD = (Int)SAD;
   }
-#endif
 #endif
 #if !RATE_CONTROL_LAMBDA_DOMAIN && KWU_RC_MADPRED_E0227