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


Ignore:
Timestamp:
11 Jul 2018, 15:19:49 (6 years ago)
Author:
tech
Message:

Merged HTM-16.2-dev@1412

File:
1 edited

Legend:

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

    r1405 r1413  
    44 * granted under this license.
    55 *
    6  * Copyright (c) 2010-2016, ITU/ISO/IEC
     6 * Copyright (c) 2010-2017, ITU/ISO/IEC
    77 * All rights reserved.
    88 *
     
    9090  Int   iStrideVir;
    9191#endif
    92 #if NH_3D_IC
     92#if NH_3D
    9393  Bool  bUseIC;
    94 #endif
    95 #if NH_3D_SDC_INTER
    9694  Bool  bUseSDCMRSAD;
    9795#endif
     
    136134    iStrideVir = 0;
    137135#endif
    138 #if NH_3D_SDC_INTER
     136#if NH_3D
    139137    bUseSDCMRSAD = false;
    140138#endif
     
    165163  Double                  m_motionLambda;
    166164  Int                     m_iCostScale;
    167 #if NH_3D_DBBP
     165#if NH_3D
    168166  Bool                    m_bUseMask;
    169167#endif
     
    204202  Void    setDistParam( DistParam& rcDP, Int bitDepth, const Pel* p1, Int iStride1, const Pel* p2, Int iStride2, Int iWidth, Int iHeight, Bool bHadamard = false );
    205203
    206 #if NH_3D_DBBP
     204#if NH_3D
    207205  Void    setUseMask(Bool b) { m_bUseMask = b; }
    208206#endif
     
    210208  Distortion calcHAD(Int bitDepth, const Pel* pi0, Int iStride0, const Pel* pi1, Int iStride1, Int iWidth, Int iHeight );
    211209
    212 #if NH_3D_ENC_DEPTH
     210#if NH_3D
    213211  UInt    calcVAR(Pel* pi0, Int stride, Int width, Int height, Int cuDepth, UInt maxCuWidth );
    214212#endif 
     
    242240  static Distortion xGetSSE64         ( DistParam* pcDtParam );
    243241  static Distortion xGetSSE16N        ( DistParam* pcDtParam );
    244 #if NH_3D_IC || NH_3D_SDC_INTER
     242#if NH_3D
    245243  static UInt xGetSADic         ( DistParam* pcDtParam );
    246244  static UInt xGetSAD4ic        ( DistParam* pcDtParam );
     
    269267#endif
    270268
    271 #if NH_3D_IC || NH_3D_SDC_INTER
     269#if NH_3D
    272270  static UInt xGetSAD12ic       ( DistParam* pcDtParam );
    273271  static UInt xGetSAD24ic       ( DistParam* pcDtParam );
     
    280278
    281279
    282 #if NH_3D_IC || NH_3D_SDC_INTER
     280#if NH_3D
    283281  static UInt xGetHADsic          ( DistParam* pcDtParam );
    284282#endif
     
    287285  static Distortion xCalcHADs2x2      ( const Pel *piOrg, const Pel *piCurr, Int iStrideOrg, Int iStrideCur, Int iStep );
    288286  static Distortion xCalcHADs4x4      ( const Pel *piOrg, const Pel *piCurr, Int iStrideOrg, Int iStrideCur, Int iStep );
    289   static Distortion xCalcHADs8x8      ( const Pel *piOrg, const Pel *piCurr, Int iStrideOrg, Int iStrideCur, Int iStep );
    290 #if NH_3D_DBBP
     287  static Distortion xCalcHADs8x8      ( const Pel *piOrg, const Pel *piCurr, Int iStrideOrg, Int iStrideCur, Int iStep
     288#if VECTOR_CODING__DISTORTION_CALCULATIONS && (RExt__HIGH_BIT_DEPTH_SUPPORT==0)
     289                                      , Int bitDepth
     290#endif
     291                                      );
     292#if NH_3D
    291293  static UInt xGetMaskedSSE     ( DistParam* pcDtParam );
    292294  static UInt xGetMaskedSAD     ( DistParam* pcDtParam );
Note: See TracChangeset for help on using the changeset viewer.