Changeset 642 in 3DVCSoftware

Timestamp:

18 Oct 2013, 15:55:24 (11 years ago)

Author:

tech

Message:

Added missing guard macros (GT_RC_MACRO_FIX).
Fixed TypeDef.h.

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
-
-#if KWU_FIX_URQ && RATE_CONTROL_LAMBDA_DOMAIN
+#define GT_RC_MACRO_FIX                             1
+
+#if KWU_FIX_URQ
+
+#if RATE_CONTROL_LAMBDA_DOMAIN
 #define RC_FIX                                      1  /// suggested fix for M0036
 #define RATE_CONTROL_INTRA                          1  ///< JCTVC-M0257, rate control for intra 
+#endif
+
+#else
+
+#define RC_FIX                                      1  /// suggested fix for M0036
+#define RATE_CONTROL_INTRA                          1  ///< JCTVC-M0257, rate control for intra 
+
 #endif
 

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

@@ -1062 +1062 @@
           {
             xCheckRDCostIntra( rpcBestCU, rpcTempCU, SIZE_2Nx2N );
-#if RATE_CONTROL_LAMBDA_DOMAIN && !M0036_RC_IMPROVEMENT
+
+#if RATE_CONTROL_LAMBDA_DOMAIN && !M0036_RC_IMPROVEMENT && GT_RC_MACRO_FIX
             if ( uiDepth <= m_addSADDepth )
             {
@@ -2316 +2317 @@
   rpcTempCU->getTotalCost() = m_pcRdCost->calcRdCost( rpcTempCU->getTotalBits(), rpcTempCU->getTotalDistortion() );
   
-#if RATE_CONTROL_LAMBDA_DOMAIN && !M0036_RC_IMPROVEMENT
+#if RATE_CONTROL_LAMBDA_DOMAIN && !M0036_RC_IMPROVEMENT && GT_RC_MACRO_FIX
   UChar uhDepth = rpcTempCU->getDepth( 0 );
   if ( m_pcEncCfg->getUseRateCtrl() && m_pcEncCfg->getLCULevelRC() && eSize == SIZE_2Nx2N && uhDepth <= m_addSADDepth )