Changeset 641 in 3DVCSoftware
- Timestamp:
- 18 Oct 2013, 15:12:55 (11 years ago)
- Location:
- branches/HTM-8.2-dev0-KWU/source/Lib
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/HTM-8.2-dev0-KWU/source/Lib/TLibCommon/TypeDef.h
r640 r641 302 302 #endif 303 303 304 #define RATE_CONTROL_LAMBDA_DOMAIN 0///< JCTVC-K0103, rate control by R-lambda model304 #define RATE_CONTROL_LAMBDA_DOMAIN 1 ///< JCTVC-K0103, rate control by R-lambda model 305 305 #define M0036_RC_IMPROVEMENT 1 ///< JCTVC-M0036, improvement for R-lambda model based rate control 306 306 #define TICKET_1090_FIX 1 … … 312 312 #endif 313 313 314 #define KWU_RC_VIEWRC_E0227 1///< JCT3V-E0227, view-wise target bitrate allocation315 #define KWU_RC_MADPRED_E0227 1///< JCT3V-E0227, inter-view MAD prediction314 #define KWU_RC_VIEWRC_E0227 0 ///< JCT3V-E0227, view-wise target bitrate allocation 315 #define KWU_RC_MADPRED_E0227 0 ///< JCT3V-E0227, inter-view MAD prediction 316 316 317 317 #define MAX_CPB_CNT 32 ///< Upper bound of (cpb_cnt_minus1 + 1) -
branches/HTM-8.2-dev0-KWU/source/Lib/TLibEncoder/TEncCu.cpp
r640 r641 1062 1062 { 1063 1063 xCheckRDCostIntra( rpcBestCU, rpcTempCU, SIZE_2Nx2N ); 1064 #if RATE_CONTROL_LAMBDA_DOMAIN 1065 #if !M0036_RC_IMPROVEMENT 1064 #if RATE_CONTROL_LAMBDA_DOMAIN && !M0036_RC_IMPROVEMENT 1066 1065 if ( uiDepth <= m_addSADDepth ) 1067 1066 { … … 1070 1069 } 1071 1070 #endif 1072 #if KWU_RC_MADPRED_E02271071 #if RATE_CONTROL_LAMBDA_DOMAIN && M0036_RC_IMPROVEMENT && KWU_RC_MADPRED_E0227 1073 1072 if ( uiDepth <= m_addSADDepth ) 1074 1073 { … … 1077 1076 } 1078 1077 #endif 1079 #endif 1078 1080 1079 #if !RATE_CONTROL_LAMBDA_DOMAIN && KWU_RC_MADPRED_E0227 1081 1080 if ( uiDepth <= m_addSADDepth ) … … 2317 2316 rpcTempCU->getTotalCost() = m_pcRdCost->calcRdCost( rpcTempCU->getTotalBits(), rpcTempCU->getTotalDistortion() ); 2318 2317 2319 #if RATE_CONTROL_LAMBDA_DOMAIN 2320 #if !M0036_RC_IMPROVEMENT 2318 #if RATE_CONTROL_LAMBDA_DOMAIN && !M0036_RC_IMPROVEMENT 2321 2319 UChar uhDepth = rpcTempCU->getDepth( 0 ); 2322 2320 if ( m_pcEncCfg->getUseRateCtrl() && m_pcEncCfg->getLCULevelRC() && eSize == SIZE_2Nx2N && uhDepth <= m_addSADDepth ) … … 2328 2326 } 2329 2327 #endif 2330 #if KWU_RC_MADPRED_E02272328 #if RATE_CONTROL_LAMBDA_DOMAIN && M0036_RC_IMPROVEMENT && KWU_RC_MADPRED_E0227 2331 2329 UChar uhDepth = rpcTempCU->getDepth( 0 ); 2332 2330 if ( m_pcEncCfg->getUseRateCtrl() && m_pcEncCfg->getLCULevelRC() && eSize == SIZE_2Nx2N && uhDepth <= m_addSADDepth ) … … 2337 2335 m_spatialSAD = (Int)SAD; 2338 2336 } 2339 #endif2340 2337 #endif 2341 2338 #if !RATE_CONTROL_LAMBDA_DOMAIN && KWU_RC_MADPRED_E0227
Note: See TracChangeset for help on using the changeset viewer.