Ignore:
Timestamp:
29 Jul 2015, 12:04:32 (9 years ago)
Author:
tech
Message:

Merged 14.1-update-dev1-LG@1303.

Location:
branches/HTM-14.1-update-dev1
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • branches/HTM-14.1-update-dev1

  • branches/HTM-14.1-update-dev1/source/Lib/TLibCommon/TComDataCU.cpp

    r1285 r1304  
    134134#if NH_3D_IC
    135135  m_pbICFlag             = NULL;
    136 #endif
    137 #if H_3D_INTER_SDC
    138136#endif
    139137#if NH_3D_DBBP

  • branches/HTM-14.1-update-dev1/source/Lib/TLibCommon/TComPattern.h

    r1279 r1304  
    8484  Bool              m_bICFlag;
    8585#endif
    86 #if H_3D_INTER_SDC
     86#if NH_3D_SDC_INTER
    8787  Bool              m_bSDCMRSADFlag;
    8888#endif
    … …  
    102102  Void  setICFlag( Bool bICFlag ) { m_bICFlag = bICFlag; }
    103103#endif
    104 #if H_3D_INTER_SDC
     104#if NH_3D_SDC_INTER
    105105  Bool  getSDCMRSADFlag()         { return m_bSDCMRSADFlag; }
    106106  Void  setSDCMRSADFlag( Bool bSDCMRSADFlag )    { m_bSDCMRSADFlag = bSDCMRSADFlag; }

  • branches/HTM-14.1-update-dev1/source/Lib/TLibCommon/TComRdCost.cpp

    r1279 r1304  
    564564  cDtParam.bUseIC       = false;
    565565#endif
    566 #if H_3D_INTER_SDC
     566#if NH_3D_SDC_INTER
    567567  cDtParam.bUseSDCMRSAD = false;
    568568#endif
    … …  
    605605  cDtParam.bUseIC       = false;
    606606#endif
    607 #if H_3D_INTER_SDC_FIX
     607#if NH_3D_SDC_INTER
    608608  cDtParam.bUseSDCMRSAD = false;
    609609#endif
    … …  
    776776  }
    777777#endif
    778 #if H_3D_INTER_SDC
     778#if NH_3D_SDC_INTER
    779779  if( pcDtParam->bUseSDCMRSAD )
    780780  {
    … …  
    818818  }
    819819#endif
    820 #if H_3D_INTER_SDC
     820#if NH_3D_SDC_INTER
    821821  if( pcDtParam->bUseSDCMRSAD )
    822822  {
    … …  
    863863  }
    864864#endif
    865 #if H_3D_INTER_SDC
     865#if NH_3D_SDC_INTER
    866866  if( pcDtParam->bUseSDCMRSAD )
    867867  {
    … …  
    912912  }
    913913#endif
    914 #if H_3D_INTER_SDC
     914#if NH_3D_SDC_INTER
    915915  if( pcDtParam->bUseSDCMRSAD )
    916916  {
    … …  
    968968  }
    969969#endif
    970 #if H_3D_INTER_SDC
     970#if NH_3D_SDC_INTER
    971971  if( pcDtParam->bUseSDCMRSAD )
    972972  {
    … …  
    10161016  }
    10171017#endif
    1018 #if H_3D_INTER_SDC
     1018#if NH_3D_SDC_INTER
    10191019  if( pcDtParam->bUseSDCMRSAD )
    10201020  {
    … …  
    10761076  }
    10771077#endif
    1078 #if H_3D_INTER_SDC
     1078#if NH_3D_SDC_INTER
    10791079  if( pcDtParam->bUseSDCMRSAD )
    10801080  {
    … …  
    11491149  }
    11501150#endif
    1151 #if H_3D_INTER_SDC
     1151#if NH_3D_SDC_INTER
    11521152  if( pcDtParam->bUseSDCMRSAD )
    11531153  {
    … …  
    12141214  }
    12151215#endif
    1216 #if H_3D_INTER_SDC
     1216#if NH_3D_SDC_INTER
    12171217  if( pcDtParam->bUseSDCMRSAD )
    12181218  {
    … …  
    13181318  }
    13191319#endif
    1320 #if H_3D_INTER_SDC
     1320#if NH_3D_SDC_INTER
    13211321  if( pcDtParam->bUseSDCMRSAD )
    13221322  {
    … …  
    13951395
    13961396
    1397 #if NH_3D_IC || H_3D_INTER_SDC
     1397#if NH_3D_IC || NH_3D_SDC_INTER
    13981398UInt TComRdCost::xGetSADic( DistParam* pcDtParam )
    13991399{
    … …  
    33403340  }
    33413341#endif
    3342 #if H_3D_INTER_SDC
     3342#if NH_3D_SDC_INTER
    33433343  if( pcDtParam->bUseSDCMRSAD )
    33443344  {
    … …  
    34103410}
    34113411
    3412 #if NH_3D_IC || H_3D_INTER_SDC
     3412#if NH_3D_IC || NH_3D_SDC_INTER
    34133413UInt TComRdCost::xGetHADsic( DistParam* pcDtParam )
    34143414{

  • branches/HTM-14.1-update-dev1/source/Lib/TLibCommon/TComRdCost.h

    r1279 r1304  
    9494  Bool  bUseIC;
    9595#endif
    96 #if H_3D_INTER_SDC
     96#if NH_3D_SDC_INTER
    9797  Bool  bUseSDCMRSAD;
    9898#endif
    … …  
    129129    iStrideVir = 0;
    130130#endif
    131 #if H_3D_INTER_SDC
     131#if NH_3D_SDC_INTER
    132132    bUseSDCMRSAD = false;
    133133#endif
    … …  
    256256  static Distortion xGetSSE64         ( DistParam* pcDtParam );
    257257  static Distortion xGetSSE16N        ( DistParam* pcDtParam );
    258 #if NH_3D_IC || H_3D_INTER_SDC
     258#if NH_3D_IC || NH_3D_SDC_INTER
    259259  static UInt xGetSADic         ( DistParam* pcDtParam );
    260260  static UInt xGetSAD4ic        ( DistParam* pcDtParam );
    … …  
    283283#endif
    284284
    285 #if NH_3D_IC || H_3D_INTER_SDC
     285#if NH_3D_IC || NH_3D_SDC_INTER
    286286  static UInt xGetSAD12ic       ( DistParam* pcDtParam );
    287287  static UInt xGetSAD24ic       ( DistParam* pcDtParam );
    … …  
    294294
    295295
    296 #if NH_3D_IC || H_3D_INTER_SDC
     296#if NH_3D_IC || NH_3D_SDC_INTER
    297297  static UInt xGetHADsic          ( DistParam* pcDtParam );
    298298#endif

  • branches/HTM-14.1-update-dev1/source/Lib/TLibCommon/TypeDef.h

    r1282 r1304  
    121121#define NH_3D_DLT                         1   // Depth Lookup Table
    122122#define NH_3D_SDC_INTRA                   1   // Segment-wise DC Coding method for INTRA
    123 #define NH_3D_SDC_INTER                   0   // Segment-wise DC Coding method for INTER 
     123#define NH_3D_SDC_INTER                   1   // Segment-wise DC Coding method for INTER 
    124124#define NH_3D_ENC_DEPTH                   1   // Encoder optimizations for depth, incl.
    125125                                              // HHI_DEPTH_INTRA_SEARCH_RAU_C0160
Note: See TracChangeset for help on using the changeset viewer.