Changeset 655 in 3DVCSoftware for trunk/source/Lib/TLibCommon/TComRdCost.h


Ignore:
Timestamp:
23 Oct 2013, 23:01:30 (11 years ago)
Author:
tech
Message:

Merged 8.1-Cleanup@654

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/source/Lib/TLibCommon/TComRdCost.h

    r622 r655  
    9494  Bool  bUseIC;
    9595#endif
    96 #if LGE_INTER_SDC_E0156
     96#if H_3D_INTER_SDC
    9797  Bool  bUseSDCMRSAD;
    9898#endif
     
    136136    iStrideVir = 0;
    137137#endif
    138 #if LGE_INTER_SDC_E0156
     138#if H_3D_INTER_SDC
    139139    bUseSDCMRSAD = false;
    140140#endif
     
    148148private:
    149149  // for distortion
    150   Int                     m_iBlkWidth;
    151   Int                     m_iBlkHeight;
    152150 
    153151#if AMP_SAD
     
    235233  UInt    calcHAD(Int bitDepth, Pel* pi0, Int iStride0, Pel* pi1, Int iStride1, Int iWidth, Int iHeight );
    236234 
    237 #if SCU_HS_FAST_DEPTH_INTRA_E0238_HHIFIX
     235#if H_3D_FAST_DEPTH_INTRA
    238236  UInt    calcVAR(Pel* pi0, Int stride, Int width, Int height, Int cuDepth);
    239237#endif 
     
    283281  static UInt xGetSSE64         ( DistParam* pcDtParam );
    284282  static UInt xGetSSE16N        ( DistParam* pcDtParam );
    285 #if H_3D_IC || LGE_INTER_SDC_E0156
     283#if H_3D_IC || H_3D_INTER_SDC
    286284  static UInt xGetSADic         ( DistParam* pcDtParam );
    287285  static UInt xGetSAD4ic        ( DistParam* pcDtParam );
     
    311309
    312310#if AMP_SAD
    313 #if H_3D_IC || LGE_INTER_SDC_E0156
     311#if H_3D_IC || H_3D_INTER_SDC
    314312  static UInt xGetSAD12ic       ( DistParam* pcDtParam );
    315313  static UInt xGetSAD24ic       ( DistParam* pcDtParam );
     
    322320#endif
    323321
    324 #if H_3D_IC || LGE_INTER_SDC_E0156
     322#if H_3D_IC || H_3D_INTER_SDC
    325323  static UInt xGetHADsic          ( DistParam* pcDtParam );
    326324#endif
     
    343341#endif
    344342
    345 #if RATE_CONTROL_LAMBDA_DOMAIN && !M0036_RC_IMPROVEMENT
     343#if (RATE_CONTROL_LAMBDA_DOMAIN && !M0036_RC_IMPROVEMENT) || KWU_RC_MADPRED_E0227
    346344  UInt   getSADPart ( Int bitDepth, Pel* pelCur, Int curStride,  Pel* pelOrg, Int orgStride, UInt width, UInt height );
    347345#endif
Note: See TracChangeset for help on using the changeset viewer.