Changeset 639 in 3DVCSoftware


Ignore:
Timestamp:
18 Oct 2013, 07:01:35 (11 years ago)
Author:
kwu-htm
Message:

Macro cleaned up.

Location:
branches/HTM-8.2-dev0-KWU/source/Lib
Files:
3 edited

Legend:

Unmodified
Added
Removed

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

    r638 r639  
    312312#endif
    313313
    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
     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
    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

    r638 r639  
    113113  m_addSADDepth      = 0;
    114114  m_temporalSAD      = 0;
    115 #endif
    116 #endif
    117 #if KWU_RC_MADPRED_E0227
     115  m_spatialSAD       = 0;
     116#endif
     117#endif
     118#if !RATE_CONTROL_LAMBDA_DOMAIN && KWU_RC_MADPRED_E0227
    118119  m_LCUPredictionSAD = 0;
    119120  m_addSADDepth      = 0;
    … …  
    279280  m_addSADDepth      = 0;
    280281  m_temporalSAD      = 0;
     282  m_spatialSAD       = 0;
    281283#endif
    282284#endif

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

    r638 r639  
    112112  Int                     m_addSADDepth;
    113113  Int                     m_temporalSAD;
    114 #endif
    115 #endif
    116 #if KWU_RC_MADPRED_E0227
     114  Int                     m_spatialSAD;
     115#endif
     116#endif
     117#if !RATE_CONTROL_LAMBDA_DOMAIN && KWU_RC_MADPRED_E0227
    117118  UInt                    m_LCUPredictionSAD;
    118119  Int                     m_addSADDepth;
Note: See TracChangeset for help on using the changeset viewer.