Changeset 643 in 3DVCSoftware

Timestamp:

18 Oct 2013, 17:21:14 (11 years ago)

Author:

kwu-htm

Message:

Macro-related revision.

Location:

branches/HTM-8.2-dev0-KWU/source/Lib

Files:

• TLibCommon/TypeDef.h (modified) (1 diff)
• TLibEncoder/TEncCu.cpp (modified) (2 diffs)

branches/HTM-8.2-dev0-KWU/source/Lib/TLibCommon/TypeDef.h

@@ -306 +306 @@
 #define TICKET_1090_FIX                             1
 #define KWU_FIX_URQ                                 1
-#define GT_RC_MACRO_FIX                             1
 
 #if KWU_FIX_URQ

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

@@ -1063 +1063 @@
             xCheckRDCostIntra( rpcBestCU, rpcTempCU, SIZE_2Nx2N );
 
-#if RATE_CONTROL_LAMBDA_DOMAIN && !M0036_RC_IMPROVEMENT && GT_RC_MACRO_FIX
+#if RATE_CONTROL_LAMBDA_DOMAIN && !M0036_RC_IMPROVEMENT && KWU_RC_MADPRED_E0227
             if ( uiDepth <= m_addSADDepth )
             {
@@ -2317 +2317 @@
   rpcTempCU->getTotalCost() = m_pcRdCost->calcRdCost( rpcTempCU->getTotalBits(), rpcTempCU->getTotalDistortion() );
   
-#if RATE_CONTROL_LAMBDA_DOMAIN && !M0036_RC_IMPROVEMENT && GT_RC_MACRO_FIX
+#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 )