Changeset 640 in 3DVCSoftware

Timestamp:

18 Oct 2013, 12:44:21 (11 years ago)

Author:

kwu-htm

Message:

Rest of the marcos fixed.

Location:

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

Files:

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

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

@@ -312 +312 @@
 #endif
 
-#define KWU_RC_VIEWRC_E0227                         0  ///< JCT3V-E0227, view-wise target bitrate allocation
-#define KWU_RC_MADPRED_E0227                        0  ///< JCT3V-E0227, inter-view MAD prediction
+#define KWU_RC_VIEWRC_E0227                         1  ///< JCT3V-E0227, view-wise target bitrate allocation
+#define KWU_RC_MADPRED_E0227                        1  ///< JCT3V-E0227, inter-view MAD prediction
 
 #define MAX_CPB_CNT                     32  ///< Upper bound of (cpb_cnt_minus1 + 1)

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
+#if !M0036_RC_IMPROVEMENT
             if ( uiDepth <= m_addSADDepth )
             {
@@ -1068 +1069 @@
               m_addSADDepth = uiDepth;
             }
-#elif RATE_CONTROL_LAMBDA_DOMAIN && KWU_RC_MADPRED_E0227
+#endif
+#if KWU_RC_MADPRED_E0227
             if ( uiDepth <= m_addSADDepth )
             {
@@ -1074 +1076 @@
               m_addSADDepth = uiDepth;
             }
+#endif
 #endif
 #if !RATE_CONTROL_LAMBDA_DOMAIN && KWU_RC_MADPRED_E0227
@@ -2314 +2317 @@
   rpcTempCU->getTotalCost() = m_pcRdCost->calcRdCost( rpcTempCU->getTotalBits(), rpcTempCU->getTotalDistortion() );
   
-#if RATE_CONTROL_LAMBDA_DOMAIN && !M0036_RC_IMPROVEMENT
+#if RATE_CONTROL_LAMBDA_DOMAIN
+#if !M0036_RC_IMPROVEMENT
   UChar uhDepth = rpcTempCU->getDepth( 0 );
   if ( m_pcEncCfg->getUseRateCtrl() && m_pcEncCfg->getLCULevelRC() && eSize == SIZE_2Nx2N && uhDepth <= m_addSADDepth )
@@ -2323 +2327 @@
     m_spatialSAD = (Int)SAD;
   }
-#elif RATE_CONTROL_LAMBDA_DOMAIN && KWU_RC_MADPRED_E0227
+#endif
+#if KWU_RC_MADPRED_E0227
   UChar uhDepth = rpcTempCU->getDepth( 0 );
   if ( m_pcEncCfg->getUseRateCtrl() && m_pcEncCfg->getLCULevelRC() && eSize == SIZE_2Nx2N && uhDepth <= m_addSADDepth )
@@ -2332 +2337 @@
     m_spatialSAD = (Int)SAD;
   }
+#endif
 #endif
 #if !RATE_CONTROL_LAMBDA_DOMAIN && KWU_RC_MADPRED_E0227