Changeset 640 in 3DVCSoftware for branches/HTM-8.2-dev0-KWU/source/Lib


Ignore:
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:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/HTM-8.2-dev0-KWU/source/Lib/TLibCommon/TypeDef.h

    r639 r640  
    312312#endif
    313313
    314 #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
     314#define KWU_RC_VIEWRC_E0227                         1  ///< JCT3V-E0227, view-wise target bitrate allocation
     315#define KWU_RC_MADPRED_E0227                        1  ///< JCT3V-E0227, inter-view MAD prediction
    316316
    317317#define MAX_CPB_CNT                     32  ///< Upper bound of (cpb_cnt_minus1 + 1)
  • branches/HTM-8.2-dev0-KWU/source/Lib/TLibEncoder/TEncCu.cpp

    r639 r640  
    10621062          {
    10631063            xCheckRDCostIntra( rpcBestCU, rpcTempCU, SIZE_2Nx2N );
    1064 #if RATE_CONTROL_LAMBDA_DOMAIN && !M0036_RC_IMPROVEMENT
     1064#if RATE_CONTROL_LAMBDA_DOMAIN
     1065#if !M0036_RC_IMPROVEMENT
    10651066            if ( uiDepth <= m_addSADDepth )
    10661067            {
     
    10681069              m_addSADDepth = uiDepth;
    10691070            }
    1070 #elif RATE_CONTROL_LAMBDA_DOMAIN && KWU_RC_MADPRED_E0227
     1071#endif
     1072#if KWU_RC_MADPRED_E0227
    10711073            if ( uiDepth <= m_addSADDepth )
    10721074            {
     
    10741076              m_addSADDepth = uiDepth;
    10751077            }
     1078#endif
    10761079#endif
    10771080#if !RATE_CONTROL_LAMBDA_DOMAIN && KWU_RC_MADPRED_E0227
     
    23142317  rpcTempCU->getTotalCost() = m_pcRdCost->calcRdCost( rpcTempCU->getTotalBits(), rpcTempCU->getTotalDistortion() );
    23152318 
    2316 #if RATE_CONTROL_LAMBDA_DOMAIN && !M0036_RC_IMPROVEMENT
     2319#if RATE_CONTROL_LAMBDA_DOMAIN
     2320#if !M0036_RC_IMPROVEMENT
    23172321  UChar uhDepth = rpcTempCU->getDepth( 0 );
    23182322  if ( m_pcEncCfg->getUseRateCtrl() && m_pcEncCfg->getLCULevelRC() && eSize == SIZE_2Nx2N && uhDepth <= m_addSADDepth )
     
    23232327    m_spatialSAD = (Int)SAD;
    23242328  }
    2325 #elif RATE_CONTROL_LAMBDA_DOMAIN && KWU_RC_MADPRED_E0227
     2329#endif
     2330#if KWU_RC_MADPRED_E0227
    23262331  UChar uhDepth = rpcTempCU->getDepth( 0 );
    23272332  if ( m_pcEncCfg->getUseRateCtrl() && m_pcEncCfg->getLCULevelRC() && eSize == SIZE_2Nx2N && uhDepth <= m_addSADDepth )
     
    23322337    m_spatialSAD = (Int)SAD;
    23332338  }
     2339#endif
    23342340#endif
    23352341#if !RATE_CONTROL_LAMBDA_DOMAIN && KWU_RC_MADPRED_E0227
Note: See TracChangeset for help on using the changeset viewer.