Changeset 1227 in 3DVCSoftware


Ignore:
Timestamp:
22 May 2015, 15:07:56 (9 years ago)
Author:
hhi
Message:
  • SDC with DMM seems to work now (incompatible with DLT -> high level syntax problem?).
  • Renamed macros for intra and inter SDC.
Location:
branches/HTM-14.1-update-dev1-RWTH/source
Files:
25 edited

Legend:

Unmodified
Added
Removed

  • branches/HTM-14.1-update-dev1-RWTH/source/App/TAppEncoder/TAppEncCfg.cpp

    r1224 r1227  
    20892089 
    20902090  // FJ: this should be removed as soon as Inter-SDC is fully implemented
    2091 #if !NH_3D_INTER_SDC
     2091#if !NH_3D_SDC_INTER
    20922092  m_interSdcFlag = false;
    20932093#endif

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

    r1221 r1227  
    177177#define NUM_DMM_MODE_CTX              1       ///< number of context models for DMM modes
    178178#endif
    179 #if NH_3D_DMM || NH_3D_INTRA_SDC
     179#if NH_3D_DMM || NH_3D_SDC_INTRA
    180180#define NUM_DDC_DATA_CTX              1       ///< number of context models for deltaDC data (DMM or SDC)
    181181#endif
    182 #if NH_3D_INTRA_SDC
     182#if NH_3D_SDC_INTRA
    183183#define SDC_NUM_RESIDUAL_FLAG_CTX     1
    184184#define SDC_NUM_RESIDUAL_CTX          1
    … …  
    577577};
    578578#endif
    579 #if NH_3D_DMM || NH_3D_INTRA_SDC
     579#if NH_3D_DMM || NH_3D_SDC_INTRA
    580580static const UChar
    581581INIT_DDC_DATA[3][NUM_DDC_DATA_CTX] =
    … …  
    586586};
    587587#endif
    588 #if NH_3D_INTRA_SDC
     588#if NH_3D_SDC_INTRA
    589589static const UChar
    590590INIT_SDC_RESIDUAL_FLAG[3][SDC_NUM_RESIDUAL_FLAG_CTX] =

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

    r1221 r1227  
    9393  STATS__CABAC_BITS__ALIGNED_ESCAPE_BITS,
    9494
    95 #if NH_3D_DMM || NH_3D_INTRA_SDC || H_3D_INTER_SDC
     95#if NH_3D_DMM || NH_3D_SDC_INTRA || H_3D_INTER_SDC
    9696  STATS__CABAC_BITS__DELTADC_SIGN_EP,
    9797  STATS__CABAC_BITS__DELTADC_PREFIX,
    … …  
    154154    "CABAC_BITS__ALIGNED_SIGN_BIT",
    155155    "CABAC_BITS__ALIGNED_ESCAPE_BITS"
    156 #if NH_3D_DMM || NH_3D_INTRA_SDC || H_3D_INTER_SDC
     156#if NH_3D_DMM || NH_3D_SDC_INTRA || H_3D_INTER_SDC
    157157   ,"STATS__CABAC_BITS__DELTADC_SIGN_EP"
    158158   ,"STATS__CABAC_BITS__DELTADC_PREFIX"

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

    r1221 r1227  
    112112  m_dmm1WedgeTabIdx = NULL;
    113113#endif
    114 #if NH_3D_INTRA_SDC
     114#if NH_3D_SDC_INTRA
    115115  m_pbSDCFlag             = NULL;
    116116  m_apSegmentDCOffset[0]  = NULL;
    … …  
    258258    m_dmm1WedgeTabIdx    = (UInt*)xMalloc(UInt, uiNumPartition);
    259259#endif
    260 #if NH_3D_INTRA_SDC
     260#if NH_3D_SDC_INTRA
    261261    m_pbSDCFlag             = (Bool*)xMalloc(Bool, uiNumPartition);
    262262    m_apSegmentDCOffset[0]  = (Pel*)xMalloc(Pel, uiNumPartition);
    … …  
    473473    if ( m_dmm1WedgeTabIdx    ) { xFree( m_dmm1WedgeTabIdx );  m_dmm1WedgeTabIdx = NULL;  }
    474474#endif
    475 #if NH_3D_INTRA_SDC
     475#if NH_3D_SDC_INTRA
    476476    if ( m_pbSDCFlag            ) { xFree(m_pbSDCFlag);             m_pbSDCFlag             = NULL; }
    477477    if ( m_apSegmentDCOffset[0] ) { xFree(m_apSegmentDCOffset[0]);  m_apSegmentDCOffset[0]  = NULL; }
    … …  
    614614    m_pbSPIVMPFlag[ui] = pcFrom->m_pbSPIVMPFlag[ui];
    615615#endif
    616 #if NH_3D_INTRA_SDC
     616#if NH_3D_SDC_INTRA
    617617  memset( m_pbSDCFlag, false, m_uiNumPartition * sizeof( *m_pbSDCFlag ) );
    618618#endif
    … …  
    653653  memset( m_dmm1WedgeTabIdx,    0,                        m_uiNumPartition * sizeof( *m_dmm1WedgeTabIdx   ) );
    654654#endif
    655 #if NH_3D_INTRA_SDC
     655#if NH_3D_SDC_INTRA
    656656    memset( m_pbSDCFlag,     false,                m_uiNumPartition * sizeof( *m_pbSDCFlag ) );
    657657    memset( m_apSegmentDCOffset[0],     0,                m_uiNumPartition * sizeof( *m_apSegmentDCOffset[0] ) );
    … …  
    811811    m_dmm1WedgeTabIdx    [ui] = 0;
    812812#endif
    813 #if NH_3D_INTRA_SDC
     813#if NH_3D_SDC_INTRA
    814814      m_pbSDCFlag           [ui] = false;
    815815      m_apSegmentDCOffset[0][ui] = 0;
    … …  
    917917  memset( m_dmm1WedgeTabIdx,    0, sizeof(UInt) * m_uiNumPartition );
    918918#endif
    919 #if NH_3D_INTRA_SDC
     919#if NH_3D_SDC_INTRA
    920920  memset( m_pbSDCFlag,            0, sizeof(Bool) * m_uiNumPartition  );
    921921  memset( m_apSegmentDCOffset[0], 0, sizeof(Pel) * m_uiNumPartition   );
    … …  
    974974  m_dmm1WedgeTabIdx    [ui] = pcCU->m_dmm1WedgeTabIdx  [uiPartOffset+ui];
    975975#endif
    976 #if NH_3D_INTRA_SDC
     976#if NH_3D_SDC_INTRA
    977977    m_pbSDCFlag           [ui] = pcCU->m_pbSDCFlag            [ uiPartOffset + ui ];
    978978    m_apSegmentDCOffset[0][ui] = pcCU->m_apSegmentDCOffset[0] [ uiPartOffset + ui ];
    … …  
    10921092  m_dmm1WedgeTabIdx    = pcCU->getDmm1WedgeTabIdx()  + uiPart;
    10931093#endif
    1094 #if NH_3D_INTRA_SDC
     1094#if NH_3D_SDC_INTRA
    10951095  m_pbSDCFlag               = pcCU->getSDCFlag()              + uiPart;
    10961096  m_apSegmentDCOffset[0]    = pcCU->getSDCSegmentDCOffset(0)  + uiPart;
    … …  
    12941294  memcpy( m_dmm1WedgeTabIdx    + uiOffset, pcCU->getDmm1WedgeTabIdx(),         sizeof(UInt) * uiNumPartition );
    12951295#endif
    1296 #if NH_3D_INTRA_SDC
     1296#if NH_3D_SDC_INTRA
    12971297  memcpy( m_pbSDCFlag             + uiOffset, pcCU->getSDCFlag(), sizeof( *m_pbSDCFlag ) * uiNumPartition  );
    12981298  memcpy( m_apSegmentDCOffset[0]  + uiOffset, pcCU->getSDCSegmentDCOffset(0), sizeof( Pel ) * uiNumPartition);
    … …  
    14171417  memcpy( pCtu->getDmm1WedgeTabIdx()           + m_absZIdxInCtu, m_dmm1WedgeTabIdx,  sizeof(UInt) * m_uiNumPartition );
    14181418#endif
    1419 #if NH_3D_INTRA_SDC
     1419#if NH_3D_SDC_INTRA
    14201420  memcpy( pCtu->getSDCFlag()             + m_absZIdxInCtu, m_pbSDCFlag, sizeof(Bool) * m_uiNumPartition );
    14211421  memcpy( pCtu->getSDCSegmentDCOffset(0) + m_absZIdxInCtu, m_apSegmentDCOffset[0], sizeof( Pel ) * m_uiNumPartition);
    … …  
    23822382}
    23832383
    2384 #if NH_3D_INTRA_SDC
     2384#if NH_3D_SDC_INTRA
    23852385Void TComDataCU::setSDCFlagSubParts ( Bool bSDCFlag, UInt absPartIdx, UInt depth )
    23862386{

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

    r1221 r1227  
    186186  UInt*         m_dmm1WedgeTabIdx;
    187187#endif
    188 #if NH_3D_INTRA_SDC
     188#if NH_3D_SDC_INTRA
    189189  Bool*         m_pbSDCFlag;
    190190  Pel*          m_apSegmentDCOffset[2];
    … …  
    563563  Void  setDmm1WedgeTabIdxSubParts    ( UInt tabIdx, UInt uiAbsPartIdx, UInt uiDepth );
    564564#endif
    565 #if NH_3D_INTRA_SDC
     565#if NH_3D_SDC_INTRA
    566566  Bool*         getSDCFlag          ()                        { return m_pbSDCFlag;               }
    567567  Bool          getSDCFlag          ( UInt uiIdx )            { return m_pbSDCFlag[uiIdx];        }

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

    r1221 r1227  
    535535  assert( iWidth == iHeight  );
    536536  assert( iWidth >= DMM_MIN_SIZE && iWidth <= DMM_MAX_SIZE );
    537 #if NH_3D_INTRA_SDC
     537#if NH_3D_SDC_INTRA
    538538  assert( !pcCU->getSDCFlag( uiAbsPartIdx ) );
    539539#endif
    … …  
    569569  assignBiSegDCs( pDst, uiStride, biSegPattern, patternStride, segDC1, segDC2 );
    570570#if !TEMP_SDC_CLEANUP // PM: should be obsolete after cleanup
    571 #if NH_3D_INTRA_SDC
     571#if NH_3D_SDC_INTRA
    572572  pcCU->setDmmPredictor(segDC1, 0);
    573573  pcCU->setDmmPredictor(segDC2, 1);
    … …  
    23892389
    23902390#if TEMP_SDC_CLEANUP // PM: consider this cleanup for SDC
    2391 #if NH_3D_INTRA_SDC
     2391#if NH_3D_SDC_INTRA
    23922392Void TComPrediction::predConstantSDC( Pel* ptrSrc, UInt srcStride, UInt uiSize, Pel& predDC )
    23932393{
    … …  
    24002400#endif
    24012401#else // PM: should be obsolete after cleanup
    2402 #if NH_3D_INTRA_SDC
     2402#if NH_3D_SDC_INTRA
    24032403Void TComPrediction::analyzeSegmentsSDC( Pel* pOrig, UInt uiStride, UInt uiSize, Pel* rpSegMeans, UInt uiNumSegments, Bool* pMask, UInt uiMaskStride
    24042404                                         ,UInt uiIntraMode
    … …  
    24652465  }
    24662466}
    2467 #endif // NH_3D_INTRA_SDC
     2467#endif // NH_3D_SDC_INTRA
    24682468#endif
    24692469

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

    r1221 r1227  
    171171#endif
    172172#if TEMP_SDC_CLEANUP // PM: consider this cleanup for SDC
    173 #if NH_3D_INTRA_SDC
     173#if NH_3D_SDC_INTRA
    174174  Void predConstantSDC            ( Pel* ptrSrc, UInt srcStride, UInt uiSize, Pel& predDC );
    175175#endif
    176176#else // PM: should be obsolete after cleanup
    177 #if NH_3D_INTRA_SDC
     177#if NH_3D_SDC_INTRA
    178178  Void analyzeSegmentsSDC         ( Pel* pOrig, UInt uiStride, UInt uiSize, Pel* rpSegMeans, UInt uiNumSegments, Bool* pMask, UInt uiMaskStride, UInt uiIntraMode, Bool orgDC=false );
    179179#endif

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

    r1223 r1227  
    6969#if NH_3D
    7070#define NH_3D_VSO                         1
    71 #define NH_3D_DMM                         0   // Depth modeling modes
    72 #define NH_3D_DLT                         1   // Depth Lookup Table
    73 #define NH_3D_INTRA_SDC                   1   // Segment-wise DC Coding method for INTRA
     71#define NH_3D_DMM                         1   // Depth modeling modes
     72#define NH_3D_DLT                         0   // Depth Lookup Table
     73#define NH_3D_SDC_INTRA                   1   // Segment-wise DC Coding method for INTRA
     74#define NH_3D_SDC_INTER                   0   // Segment-wise DC Coding method for INTER 
    7475#define NH_3D_ENC_DEPTH                   1   // Encoder optimizations for depth, incl.
    7576                                              // HHI_DEPTH_INTRA_SEARCH_RAU_C0160

  • branches/HTM-14.1-update-dev1-RWTH/source/Lib/TLibDecoder/TDecCAVLC.cpp

    r1221 r1227  
    33903390}
    33913391#endif
    3392 #if NH_3D_INTRA_SDC || H_3D_INTER_SDC
     3392#if NH_3D_SDC_INTRA || H_3D_INTER_SDC
    33933393Void TDecCavlc::parseSDCFlag    ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth )
    33943394{

  • branches/HTM-14.1-update-dev1-RWTH/source/Lib/TLibDecoder/TDecCAVLC.h

    r1221 r1227  
    123123  Void  parseICFlag         ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth );
    124124#endif
    125 #if NH_3D_DMM || NH_3D_INTRA_SDC || H_3D_INTER_SDC
     125#if NH_3D_DMM || NH_3D_SDC_INTRA || H_3D_INTER_SDC
    126126  Void  parseDeltaDC        ( TComDataCU* /*pcCU*/, UInt /*absPartIdx*/, UInt /*depth*/ ) { assert(0); };
    127127#endif
    128 #if NH_3D_INTRA_SDC || H_3D_INTER_SDC
     128#if NH_3D_SDC_INTRA || H_3D_INTER_SDC
    129129  Void  parseSDCFlag        ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth );
    130130#endif

  • branches/HTM-14.1-update-dev1-RWTH/source/Lib/TLibDecoder/TDecCu.cpp

    r1223 r1227  
    527527    if(pcCU->getIPCMFlag(uiAbsPartIdx))
    528528    {
    529 #if NH_3D_INTRA_SDC
     529#if NH_3D_SDC_INTRA
    530530      m_pcEntropyDecoder->decodeSDCFlag( pcCU, uiAbsPartIdx, uiDepth );
    531531#endif
    … …  
    647647      //xReconDIS( m_ppcCU[uiDepth], 0, uiDepth );
    648648    }
    649 #if NH_3D_INTRA_SDC
     649#if NH_3D_SDC_INTRA
    650650    else if( m_ppcCU[uiDepth]->getSDCFlag(0) )
    651651    {
    … …  
    11831183}
    11841184
    1185 #if NH_3D_INTRA_SDC
     1185#if NH_3D_SDC_INTRA
    11861186Void TDecCu::xReconIntraSDC( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth )
    11871187{
    … …  
    12311231
    12321232    //===== init availability pattern =====
    1233 #if !TEMP_SDC_CLEANUP // PM: please migrate together with below "initPattern" and remove macro
    1234     pcCU->getPattern()->initPattern   ( pcCU, sdcDepth, uiAbsPartIdx );
    1235     pcCU->getPattern()->initAdiPattern( pcCU, uiAbsPartIdx, sdcDepth, m_pcPrediction->getPredicBuf(), m_pcPrediction->getPredicBufWidth(), m_pcPrediction->getPredicBufHeight(), bAboveAvail, bLeftAvail );
    1236 #endif
     1233    TComTURecurse tuRecurseCU(pcCU, 0);
     1234    TComTURecurse tuRecurseWithPU(tuRecurseCU, false, TComTU::DONT_SPLIT);
     1235
     1236    Bool bAboveAvail = false;
     1237    Bool bLeftAvail  = false;
     1238    m_pcPrediction->initIntraPatternChType( tuRecurseWithPU, bAboveAvail, bLeftAvail, COMPONENT_Y, false DEBUG_STRING_PASS_INTO(sTemp) );
    12371239
    12381240    // get partition

  • branches/HTM-14.1-update-dev1-RWTH/source/Lib/TLibDecoder/TDecCu.h

    r1221 r1227  
    127127  Void xReconDIS               ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth );
    128128#endif
    129 #if NH_3D_INTRA_SDC
     129#if NH_3D_SDC_INTRA
    130130  Void xReconIntraSDC           ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth );
    131131#endif

  • branches/HTM-14.1-update-dev1-RWTH/source/Lib/TLibDecoder/TDecEntropy.cpp

    r1221 r1227  
    162162  {
    163163    decodeIntraDirModeLuma  ( pcCU, uiAbsPartIdx, uiDepth );
    164 #if NH_3D_INTRA_SDC
     164#if NH_3D_SDC_INTRA
    165165    decodeSDCFlag   ( pcCU, uiAbsPartIdx, uiDepth );
    166166#endif
    … …  
    960960Void TDecEntropy::decodeCoeff( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth, Bool& bCodeDQP, Bool& isChromaQpAdjCoded )
    961961{
    962 #if NH_3D_INTRA_SDC
     962#if NH_3D_SDC_INTRA
    963963  if( pcCU->getSDCFlag( uiAbsPartIdx ) && pcCU->isIntra( uiAbsPartIdx) )
    964964  {
    … …  
    979979  if( pcCU->getSlice()->getIsDepth() )
    980980  {
    981 #if NH_3D_INTRA_SDC || H_3D_INTER_SDC
     981#if NH_3D_SDC_INTRA || H_3D_INTER_SDC
    982982    if( pcCU->getSDCFlag( uiAbsPartIdx ) )
    983983    {
    … …  
    10371037}
    10381038
    1039 #if NH_3D_INTRA_SDC || H_3D_INTER_SDC
     1039#if NH_3D_SDC_INTRA || H_3D_INTER_SDC
    10401040Void TDecEntropy::decodeSDCFlag( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth )
    10411041{

  • branches/HTM-14.1-update-dev1-RWTH/source/Lib/TLibDecoder/TDecEntropy.h

    r1221 r1227  
    9191  virtual Void parseICFlag        ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth ) = 0;
    9292#endif
    93 #if NH_3D_DMM || NH_3D_INTRA_SDC || H_3D_INTER_SDC
     93#if NH_3D_DMM || NH_3D_SDC_INTRA || H_3D_INTER_SDC
    9494  virtual Void  parseDeltaDC      ( TComDataCU* pcCU, UInt absPartIdx, UInt depth ) = 0;
    9595#endif
    96 #if NH_3D_INTRA_SDC || H_3D_INTER_SDC
     96#if NH_3D_SDC_INTRA || H_3D_INTER_SDC
    9797  virtual Void parseSDCFlag       ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth ) = 0;
    9898#endif
    … …  
    183183#endif
    184184
    185 #if NH_3D_INTRA_SDC || H_3D_INTER_SDC
     185#if NH_3D_SDC_INTRA || H_3D_INTER_SDC
    186186  Void decodeSDCFlag           ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth );
    187187#endif

  • branches/HTM-14.1-update-dev1-RWTH/source/Lib/TLibDecoder/TDecSbac.cpp

    r1223 r1227  
    111111, m_cDmmModeSCModel                          ( 1,             1,                      NUM_DMM_MODE_CTX                     , m_contextModels + m_numContextModels, m_numContextModels)
    112112#endif
    113 #if NH_3D_DMM || NH_3D_INTRA_SDC
     113#if NH_3D_DMM || NH_3D_SDC_INTRA
    114114, m_cDdcDataSCModel                          ( 1,             1,                      NUM_DDC_DATA_CTX                     , m_contextModels + m_numContextModels, m_numContextModels)
    115115#endif
    116 #if NH_3D_INTRA_SDC
     116#if NH_3D_SDC_INTRA
    117117, m_cSDCResidualFlagSCModel                  ( 1,             1,                     SDC_NUM_RESIDUAL_FLAG_CTX             , m_contextModels + m_numContextModels, m_numContextModels)
    118118, m_cSDCResidualSCModel                      ( 1,             1,                     SDC_NUM_RESIDUAL_CTX                  , m_contextModels + m_numContextModels, m_numContextModels)
    … …  
    202202  m_cDmmModeSCModel.initBuffer                    ( sliceType, qp, (UChar*)INIT_DMM_MODE );
    203203#endif
    204 #if NH_3D_DMM || NH_3D_INTRA_SDC
     204#if NH_3D_DMM || NH_3D_SDC_INTRA
    205205  m_cDdcDataSCModel.initBuffer                    ( sliceType, qp, (UChar*)INIT_DDC_DATA );
    206206#endif
    207 #if NH_3D_INTRA_SDC
     207#if NH_3D_SDC_INTRA
    208208  m_cSDCResidualFlagSCModel.initBuffer            ( sliceType, qp, (UChar*)INIT_SDC_RESIDUAL_FLAG );
    209209  m_cSDCResidualSCModel.initBuffer                ( sliceType, qp, (UChar*)INIT_SDC_RESIDUAL );
    … …  
    23342334#endif
    23352335
    2336 #if NH_3D_DMM || NH_3D_INTRA_SDC || H_3D_INTER_SDC
     2336#if NH_3D_DMM || NH_3D_SDC_INTRA || H_3D_INTER_SDC
    23372337Void TDecSbac::parseDeltaDC( TComDataCU* pcCU, UInt absPartIdx, UInt depth )
    23382338{
    2339 #if NH_3D_INTRA_SDC || H_3D_INTER_SDC
     2339#if NH_3D_SDC_INTRA || H_3D_INTER_SDC
    23402340  if( !(pcCU->getSDCFlag( absPartIdx )) )
    23412341#endif
    … …  
    23462346
    23472347  UInt symbol = 1;
    2348 #if NH_3D_INTRA_SDC
     2348#if NH_3D_SDC_INTRA
    23492349  if( pcCU->isIntra( absPartIdx ) && pcCU->getSDCFlag( absPartIdx ))
    23502350  {
    … …  
    23702370    if( pcCU->isIntra( absPartIdx ) )
    23712371    {
    2372 #if NH_3D_INTRA_SDC
     2372#if NH_3D_SDC_INTRA
    23732373      if( pcCU->getSDCFlag( absPartIdx ) )
    23742374      {
    … …  
    23812381        pcCU->setDmmDeltaDC( getDmmType( pcCU->getIntraDir( CHANNEL_TYPE_LUMA, absPartIdx ) ), segment, absPartIdx, valDeltaDC );
    23822382#endif
    2383 #if NH_3D_INTRA_SDC
     2383#if NH_3D_SDC_INTRA
    23842384      }
    23852385#endif
    … …  
    25042504}
    25052505#endif
    2506 #if NH_3D_INTRA_SDC || H_3D_INTER_SDC
     2506#if NH_3D_SDC_INTRA || H_3D_INTER_SDC
    25072507Void TDecSbac::parseSDCFlag( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth )
    25082508{

  • branches/HTM-14.1-update-dev1-RWTH/source/Lib/TLibDecoder/TDecSbac.h

    r1221 r1227  
    107107  Void  xReadCoefRemainExGolomb ( UInt &rSymbol, UInt &rParam, const Bool useLimitedPrefixLength, const Int maxLog2TrDynamicRange );
    108108#endif
    109 #if NH_3D_DMM || NH_3D_INTRA_SDC || H_3D_INTER_SDC
     109#if NH_3D_DMM || NH_3D_SDC_INTRA || H_3D_INTER_SDC
    110110  Void  xReadExGolombLevelDdc( UInt& ruiSymbol );
    111111  Void  xParseDeltaDC        ( Pel& rValDeltaDC, UInt uiNumSeg );
    … …  
    116116  Void  xParseDmm1WedgeIdx   ( UInt& ruiTabIdx, Int iNumBit );
    117117#endif
    118 #if NH_3D_INTRA_SDC
     118#if NH_3D_SDC_INTRA
    119119  Void  xParseSDCResidualData     ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth, UInt uiPart );
    120120#endif
    121 #if NH_3D_INTRA_SDC || H_3D_INTER_SDC
     121#if NH_3D_SDC_INTRA || H_3D_INTER_SDC
    122122  Void  parseSDCFlag         ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth );
    123123#endif
    … …  
    136136  Void parseDIS          ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth );
    137137#endif
    138 #if NH_3D_DMM || NH_3D_INTRA_SDC || H_3D_INTER_SDC
     138#if NH_3D_DMM || NH_3D_SDC_INTRA || H_3D_INTER_SDC
    139139  Void  parseDeltaDC      ( TComDataCU* pcCU, UInt absPartIdx, UInt depth );
    140140#endif
    … …  
    229229  ContextModel3DBuffer m_cDmmModeSCModel;
    230230#endif
    231 #if NH_3D_DMM || NH_3D_INTRA_SDC
     231#if NH_3D_DMM || NH_3D_SDC_INTRA
    232232  ContextModel3DBuffer m_cDdcDataSCModel;
    233233#endif
    234 #if NH_3D_INTRA_SDC 
     234#if NH_3D_SDC_INTRA 
    235235  ContextModel3DBuffer m_cSDCResidualFlagSCModel;
    236236  ContextModel3DBuffer m_cSDCResidualSCModel;

  • branches/HTM-14.1-update-dev1-RWTH/source/Lib/TLibEncoder/TEncCavlc.cpp

    r1221 r1227  
    28432843   assert(0);
    28442844 }
    2845 #if NH_3D_INTRA_SDC || H_3D_INTER_SDC
     2845#if NH_3D_SDC_INTRA || H_3D_INTER_SDC
    28462846Void TEncCavlc::codeSDCFlag ( TComDataCU* pcCU, UInt uiAbsPartIdx )
    28472847{

  • branches/HTM-14.1-update-dev1-RWTH/source/Lib/TLibEncoder/TEncCavlc.h

    r1221 r1227  
    126126  Void codeMergeFlag     ( TComDataCU* pcCU, UInt uiAbsPartIdx );
    127127  Void codeMergeIndex    ( TComDataCU* pcCU, UInt uiAbsPartIdx );
    128 #if NH_3D_DMM || NH_3D_INTRA_SDC || H_3D_INTER_SDC
     128#if NH_3D_DMM || NH_3D_SDC_INTRA || H_3D_INTER_SDC
    129129  Void  codeDeltaDC      ( TComDataCU* /*pcCU*/, UInt /*absPartIdx*/ ) { assert(0); };
    130130#endif
    … …  
    136136#endif
    137137
    138 #if NH_3D_INTRA_SDC || H_3D_INTER_SDC
     138#if NH_3D_SDC_INTRA || H_3D_INTER_SDC
    139139  Void codeSDCFlag       ( TComDataCU* pcCU, UInt uiAbsPartIdx );
    140140#endif

  • branches/HTM-14.1-update-dev1-RWTH/source/Lib/TLibEncoder/TEncCu.cpp

    r1221 r1227  
    15971597    if(pcCU->getIPCMFlag(uiAbsPartIdx))
    15981598    {
    1599 #if NH_3D_INTRA_SDC
     1599#if NH_3D_SDC_INTRA
    16001600      m_pcEntropyCoder->encodeSDCFlag( pcCU, uiAbsPartIdx );
    16011601#endif 
    … …  
    16121612  m_pcEntropyCoder->encodeDBBPFlag( pcCU, uiAbsPartIdx );
    16131613#endif
    1614 #if NH_3D_INTRA_SDC
     1614#if NH_3D_SDC_INTRA
    16151615  m_pcEntropyCoder->encodeSDCFlag( pcCU, uiAbsPartIdx );
    16161616#endif 
    … …  
    24702470  rpcTempCU->setDISFlagSubParts(true, 0, uiDepth);
    24712471  rpcTempCU->setLumaIntraDirSubParts (DC_IDX, 0, uiDepth);
    2472 #if NH_3D_INTRA_SDC
     2472#if NH_3D_SDC_INTRA
    24732473  rpcTempCU->setSDCFlagSubParts( false, 0, uiDepth);
    24742474#endif
    … …  
    27012701  }
    27022702 
    2703 #if NH_3D_INTRA_SDC
     2703#if NH_3D_SDC_INTRA
    27042704  if( rpcTempCU->getSDCFlag( 0 ) )
    27052705  {
    … …  
    27252725  m_pcEntropyCoder->encodePredInfo( rpcTempCU, 0 );
    27262726  m_pcEntropyCoder->encodeIPCMInfo(rpcTempCU, 0, true );
    2727 #if NH_3D_INTRA_SDC
     2727#if NH_3D_SDC_INTRA
    27282728    m_pcEntropyCoder->encodeSDCFlag( rpcTempCU, 0, true );
    27292729#endif
    … …  
    28102810  m_pcEntropyCoder->encodePartSize ( rpcTempCU, 0, uiDepth, true );
    28112811  m_pcEntropyCoder->encodeIPCMInfo ( rpcTempCU, 0, true );
    2812 #if NH_3D_INTRA_SDC
     2812#if NH_3D_SDC_INTRA
    28132813  m_pcEntropyCoder->encodeSDCFlag( rpcTempCU, 0, true );
    28142814#endif

  • branches/HTM-14.1-update-dev1-RWTH/source/Lib/TLibEncoder/TEncEntropy.cpp

    r1221 r1227  
    711711#endif
    712712
    713 #if NH_3D_INTRA_SDC
     713#if NH_3D_SDC_INTRA
    714714  if( pcCU->getSDCFlag( uiAbsPartIdx ) && pcCU->isIntra( uiAbsPartIdx ) )
    715715  {
    … …  
    730730  if( pcCU->getSlice()->getIsDepth() )
    731731  {
    732 #if NH_3D_INTRA_SDC || H_3D_INTER_SDC
     732#if NH_3D_SDC_INTRA || H_3D_INTER_SDC
    733733    if( pcCU->getSDCFlag( uiAbsPartIdx ) )
    734734    {
    … …  
    839839}
    840840
    841 #if NH_3D_DMM || NH_3D_INTRA_SDC || H_3D_INTER_SDC
     841#if NH_3D_DMM || NH_3D_SDC_INTRA || H_3D_INTER_SDC
    842842Void TEncEntropy::encodeDeltaDC  ( TComDataCU* pcCU, UInt absPartIdx )
    843843{
    … …  
    845845}
    846846#endif
    847 #if NH_3D_INTRA_SDC || H_3D_INTER_SDC
     847#if NH_3D_SDC_INTRA || H_3D_INTER_SDC
    848848Void TEncEntropy::encodeSDCFlag( TComDataCU* pcCU, UInt uiAbsPartIdx, Bool bRD )
    849849{

  • branches/HTM-14.1-update-dev1-RWTH/source/Lib/TLibEncoder/TEncEntropy.h

    r1221 r1227  
    8484  virtual Void codeMergeFlag     ( TComDataCU* pcCU, UInt uiAbsPartIdx ) = 0;
    8585  virtual Void codeMergeIndex    ( TComDataCU* pcCU, UInt uiAbsPartIdx ) = 0;
    86 #if NH_3D_DMM || NH_3D_INTRA_SDC || H_3D_INTER_SDC
     86#if NH_3D_DMM || NH_3D_SDC_INTRA || H_3D_INTER_SDC
    8787  virtual Void codeDeltaDC       ( TComDataCU* pcCU, UInt uiAbsPartIdx ) = 0;
    8888#endif
    … …  
    9393  virtual Void codeICFlag        ( TComDataCU* pcCU, UInt uiAbsPartIdx ) = 0;
    9494#endif
    95 #if NH_3D_INTRA_SDC || H_3D_INTER_SDC
     95#if NH_3D_SDC_INTRA || H_3D_INTER_SDC
    9696  virtual Void codeSDCFlag       ( TComDataCU* pcCU, UInt uiAbsPartIdx ) = 0;
    9797#endif
    … …  
    181181  Void encodeICFlag       ( TComDataCU* pcCU, UInt uiAbsPartIdx, Bool bRD = false );
    182182#endif
    183 #if NH_3D_DMM || NH_3D_INTRA_SDC || H_3D_INTER_SDC
     183#if NH_3D_DMM || NH_3D_SDC_INTRA || H_3D_INTER_SDC
    184184  Void encodeDeltaDC      ( TComDataCU* pcCU, UInt absPartIdx );
    185185#endif
    186 #if NH_3D_INTRA_SDC || H_3D_INTER_SDC
     186#if NH_3D_SDC_INTRA || H_3D_INTER_SDC
    187187  Void encodeSDCFlag      ( TComDataCU* pcCU, UInt uiAbsPartIdx, Bool bRD = false );
    188188#endif

  • branches/HTM-14.1-update-dev1-RWTH/source/Lib/TLibEncoder/TEncSbac.cpp

    r1223 r1227  
    106106, m_cDmmModeSCModel                    ( 1,             1,                      NUM_DMM_MODE_CTX                     , m_contextModels + m_numContextModels, m_numContextModels)
    107107#endif
    108 #if NH_3D_DMM || NH_3D_INTRA_SDC
     108#if NH_3D_DMM || NH_3D_SDC_INTRA
    109109, m_cDdcDataSCModel                    ( 1,             1,                      NUM_DDC_DATA_CTX                     , m_contextModels + m_numContextModels, m_numContextModels)
    110110#endif
    111 #if NH_3D_INTRA_SDC
     111#if NH_3D_SDC_INTRA
    112112, m_cSDCResidualFlagSCModel            ( 1,             1,                      SDC_NUM_RESIDUAL_FLAG_CTX            , m_contextModels + m_numContextModels, m_numContextModels)
    113113, m_cSDCResidualSCModel                ( 1,             1,                      SDC_NUM_RESIDUAL_CTX                 , m_contextModels + m_numContextModels, m_numContextModels)
    … …  
    187187  m_cDmmModeSCModel.initBuffer                    ( eSliceType, iQp, (UChar*)INIT_DMM_MODE );
    188188#endif
    189 #if NH_3D_DMM || NH_3D_INTRA_SDC
     189#if NH_3D_DMM || NH_3D_SDC_INTRA
    190190  m_cDdcDataSCModel.initBuffer                    ( eSliceType, iQp, (UChar*)INIT_DDC_DATA );
    191191#endif
    192 #if NH_3D_INTRA_SDC
     192#if NH_3D_SDC_INTRA
    193193  m_cSDCResidualFlagSCModel.initBuffer            ( eSliceType, iQp, (UChar*)INIT_SDC_RESIDUAL_FLAG );
    194194  m_cSDCResidualSCModel.initBuffer                ( eSliceType, iQp, (UChar*)INIT_SDC_RESIDUAL );
    … …  
    243243      curCost += m_cCUICFlagSCModel.calcCost                   ( curSliceType, qp, (UChar*)INIT_IC_FLAG );
    244244#endif                                                     
    245 #if NH_3D_INTRA_SDC
     245#if NH_3D_SDC_INTRA
    246246      curCost += m_cSDCFlagSCModel.calcCost                    ( curSliceType, qp, (UChar*)INIT_SDC_FLAG );
    247247#endif                                                     
    … …  
    280280      curCost += m_cDmmModeSCModel.calcCost                    ( curSliceType, qp, (UChar*)INIT_DMM_MODE );
    281281#endif
    282 #if NH_3D_DMM || NH_3D_INTRA_SDC
     282#if NH_3D_DMM || NH_3D_SDC_INTRA
    283283      curCost += m_cDdcDataSCModel.calcCost                    ( curSliceType, qp, (UChar*)INIT_DDC_DATA );
    284284#endif
    … …  
    24732473}
    24742474
    2475 #if NH_3D_DMM || NH_3D_INTRA_SDC || H_3D_INTER_SDC
     2475#if NH_3D_DMM || NH_3D_SDC_INTRA || H_3D_INTER_SDC
    24762476Void TEncSbac::codeDeltaDC( TComDataCU* pcCU, UInt absPartIdx )
    24772477{
    2478 #if NH_3D_INTRA_SDC || H_3D_INTER_SDC
     2478#if NH_3D_SDC_INTRA || H_3D_INTER_SDC
    24792479  if( !(pcCU->getSDCFlag( absPartIdx )) )
    24802480#endif
    … …  
    24902490
    24912491  UInt hasDeltaDC = 1;
    2492 #if NH_3D_INTRA_SDC
     2492#if NH_3D_SDC_INTRA
    24932493  if( pcCU->isIntra( absPartIdx ) && pcCU->getSDCFlag( absPartIdx ))
    24942494  {
    … …  
    25122512      if( pcCU->isIntra( absPartIdx ) )
    25132513      {
    2514 #if NH_3D_INTRA_SDC
     2514#if NH_3D_SDC_INTRA
    25152515        if( pcCU->getSDCFlag( absPartIdx ) )
    25162516        {
    … …  
    25232523        deltaDC = pcCU->getDmmDeltaDC( getDmmType( pcCU->getIntraDir( CHANNEL_TYPE_LUMA, absPartIdx ) ), segment, absPartIdx );
    25242524#endif
    2525 #if NH_3D_INTRA_SDC
     2525#if NH_3D_SDC_INTRA
    25262526        }
    25272527#endif
    … …  
    26282628#endif
    26292629
    2630 #if NH_3D_INTRA_SDC || H_3D_INTER_SDC
     2630#if NH_3D_SDC_INTRA || H_3D_INTER_SDC
    26312631Void TEncSbac::codeSDCFlag( TComDataCU* pcCU, UInt uiAbsPartIdx )
    26322632{

  • branches/HTM-14.1-update-dev1-RWTH/source/Lib/TLibEncoder/TEncSbac.h

    r1221 r1227  
    115115  Void  xWriteEpExGolomb     ( UInt uiSymbol, UInt uiCount );
    116116  Void  xWriteCoefRemainExGolomb ( UInt symbol, UInt &rParam, const Bool useLimitedPrefixLength, const Int maxLog2TrDynamicRange );
    117 #if NH_3D_DMM || NH_3D_INTRA_SDC || H_3D_INTER_SDC
     117#if NH_3D_DMM || NH_3D_SDC_INTRA || H_3D_INTER_SDC
    118118  Void  xWriteExGolombLevelDdc( UInt uiSymbol );
    119119  Void  xCodeDeltaDC         ( Pel valDeltaDC, UInt uiNumSeg );
    … …  
    149149  Void codeICFlag        ( TComDataCU* pcCU, UInt uiAbsPartIdx );
    150150#endif
    151 #if NH_3D_DMM || NH_3D_INTRA_SDC || H_3D_INTER_SDC
     151#if NH_3D_DMM || NH_3D_SDC_INTRA || H_3D_INTER_SDC
    152152  Void  codeDeltaDC      ( TComDataCU* pcCU, UInt absPartIdx );
    153153#endif
    154 #if NH_3D_INTRA_SDC || H_3D_INTER_SDC
     154#if NH_3D_SDC_INTRA || H_3D_INTER_SDC
    155155  Void codeSDCFlag       ( TComDataCU* pcCU, UInt uiAbsPartIdx );
    156156#endif
    … …  
    252252  ContextModel3DBuffer m_cDmmModeSCModel;
    253253#endif
    254 #if NH_3D_DMM || NH_3D_INTRA_SDC
     254#if NH_3D_DMM || NH_3D_SDC_INTRA
    255255  ContextModel3DBuffer m_cDdcDataSCModel;
    256256#endif
    257 #if NH_3D_INTRA_SDC 
     257#if NH_3D_SDC_INTRA 
    258258  ContextModel3DBuffer m_cSDCResidualFlagSCModel;
    259259  ContextModel3DBuffer m_cSDCResidualSCModel;

  • branches/HTM-14.1-update-dev1-RWTH/source/Lib/TLibEncoder/TEncSearch.cpp

    r1223 r1227  
    10311031        if ( pcCU->getIPCMFlag (0))
    10321032        {
    1033 #if NH_3D_INTRA_SDC
     1033#if NH_3D_SDC_INTRA
    10341034            m_pcEntropyCoder->encodeSDCFlag( pcCU, 0, true );
    10351035#endif
    … …  
    10511051      {
    10521052        m_pcEntropyCoder->encodeIntraDirModeLuma ( pcCU, 0 );
    1053 #if NH_3D_INTRA_SDC
     1053#if NH_3D_SDC_INTRA
    10541054          m_pcEntropyCoder->encodeSDCFlag( pcCU, 0, true );
    10551055#if NH_3D_DMM
    … …  
    10681068      {
    10691069        m_pcEntropyCoder->encodeIntraDirModeLuma ( pcCU, uiAbsPartIdx );
    1070 #if NH_3D_INTRA_SDC
    1071           }
    1072           m_pcEntropyCoder->encodeSDCFlag( pcCU, 0, true );
    1073           for( UInt uiPart = 0; uiPart < 4; uiPart++ )
    1074           {
    1075 #if NH_3D_DMM
    1076             if( pcCU->getSlice()->getIsDepth() && ( !pcCU->getSDCFlag( uiPart * uiQNumParts ) ) && isDmmMode( pcCU->getIntraDir( CHANNEL_TYPE_LUMA, uiPart * uiQNumParts ) ) )
    1077             {
    1078               m_pcEntropyCoder->encodeDeltaDC( pcCU, uiPart * uiQNumParts );
    1079             }
    1080 #endif
    1081 #endif
    1082 #if NH_3D_INTRA_SDC
     1070#if NH_3D_SDC_INTRA
    10831071          if( uiAbsPartIdx == 0 ) 
    10841072          {
    … …  
    10861074          }
    10871075#if NH_3D_DMM
    1088           if( pcCU->getSlice()->getIsDepth() && ( pcCU->getSDCFlag( uiAbsPartIdx ) ) && isDmmMode( pcCU->getIntraDir( CHANNEL_TYPE_LUMA, uiAbsPartIdx ) ) )
     1076          if( pcCU->getSlice()->getIsDepth() && ( !pcCU->getSDCFlag( uiAbsPartIdx ) ) && isDmmMode( pcCU->getIntraDir( CHANNEL_TYPE_LUMA, uiAbsPartIdx ) ) )
    10891077          {
    10901078            m_pcEntropyCoder->encodeDeltaDC( pcCU, uiAbsPartIdx );
    … …  
    19801968}
    19811969#endif
    1982 #if NH_3D_INTRA_SDC
     1970#if NH_3D_SDC_INTRA
    19831971Void TEncSearch::xIntraCodingSDC( TComDataCU* pcCU, UInt uiAbsPartIdx, TComYuv* pcOrgYuv, TComYuv* pcPredYuv, Dist& ruiDist, Double& dRDCost, Bool bZeroResidual, Int iSDCDeltaResi  )
    19841972{
    … …  
    20242012
    20252013    //===== init availability pattern =====
    2026 #if !TEMP_SDC_CLEANUP // PM: please migrate together with below "initPattern" and remove macro
    2027     pcCU->getPattern()->initPattern   ( pcCU, sdcDepth, uiAbsPartIdx );
    2028     pcCU->getPattern()->initAdiPattern( pcCU, uiAbsPartIdx, sdcDepth, m_piYuvExt, m_iYuvExtStride, m_iYuvExtHeight, bAboveAvail, bLeftAvail );
    2029 #endif
     2014    TComTURecurse tuRecurseCU(pcCU, 0);
     2015    TComTURecurse tuRecurseWithPU(tuRecurseCU, false, TComTU::DONT_SPLIT);
     2016
     2017    Bool bAboveAvail = false;
     2018    Bool bLeftAvail  = false;
     2019    initIntraPatternChType( tuRecurseWithPU, bAboveAvail, bLeftAvail, COMPONENT_Y, false DEBUG_STRING_PASS_INTO(sTemp) );
    20302020
    20312021    // get partition
    … …  
    32573247    UInt rdSDC = m_pcEncCfg->getIsDepth() ? numModesForFullRD : 0;
    32583248#endif
    3259 #if NH_3D_INTRA_SDC
     3249#if NH_3D_SDC_INTRA
    32603250    Bool    bBestUseSDC   = false;
    32613251    Pel     apBestDCOffsets[2] = {0,0};
    … …  
    33083298      pcCU->setIntraDirSubParts ( CHANNEL_TYPE_LUMA, uiOrgMode, uiPartOffset, uiDepth + uiInitTrDepth );
    33093299
    3310 #if NH_3D_INTRA_SDC
     3300#if NH_3D_SDC_INTRA
    33113301#if H_3D_FAST_INTRA_SDC
    33123302      Bool bTestSDC = ( ( m_pcEncCfg->getUseSDC() &&  pcCU->getSlice()->getIntraSdcWedgeFlag() ) && pcCU->getSDCAvailable(uiPartOffset) && uiMode >= numModesForFullRD);
    … …  
    33553345#if NH_3D_ENC_DEPTH
    33563346          UInt zeroResiTest = (pcCU->getSlice()->getIsDepth() && !pcCU->getSlice()->isIRAP()) ? 1 : 0;
    3357 #if NH_3D_INTRA_SDC
     3347#if NH_3D_SDC_INTRA
    33583348          zeroResiTest |= pcCU->getSDCFlag(uiPartOffset);
    33593349          if( uiSDC != 0 && iSDCDeltaResi != 0 )
    … …  
    33823372      }
    33833373#endif
    3384 #if NH_3D_INTRA_SDC
     3374#if NH_3D_SDC_INTRA
    33853375            if( pcCU->getSDCFlag(uiPartOffset) )
    33863376            {
    … …  
    34213411#endif
    34223412#endif
    3423 #if NH_3D_INTRA_SDC
     3413#if NH_3D_SDC_INTRA
    34243414            }
    34253415#endif
    … …  
    34423432        dBestPUCost   = dPUCost;
    34433433
    3444 #if NH_3D_INTRA_SDC
     3434#if NH_3D_SDC_INTRA
    34453435              if( pcCU->getSDCFlag(uiPartOffset) )
    34463436              {
    … …  
    34883478          ::memcpy( m_puhQTTempTransformSkipFlag[compID],  pcCU->getTransformSkip(compID)  + uiPartOffset, uiQPartNum * sizeof( UChar ) );
    34893479        }
    3490 #if NH_3D_INTRA_SDC
     3480#if NH_3D_SDC_INTRA
    34913481        }
    34923482#endif
    … …  
    35023492          }
    35033493#endif
    3504 #if NH_3D_INTRA_SDC
     3494#if NH_3D_SDC_INTRA
    35053495        } // SDC residual loop
    35063496      } // SDC loop
    … …  
    35333523
    35343524      pcCU->setIntraDirSubParts ( CHANNEL_TYPE_LUMA, uiOrgMode, uiPartOffset, uiDepth + uiInitTrDepth );
    3535 #if NH_3D_INTRA_SDC
     3525#if NH_3D_SDC_INTRA
    35363526      pcCU->setSDCFlagSubParts(false, uiPartOffset, uiDepth + uiInitTrDepth);
    35373527#endif
    … …  
    35663556        uiBestPUDistY = uiPUDistY;
    35673557        dBestPUCost   = dPUCost;
    3568 #if NH_3D_INTRA_SDC
     3558#if NH_3D_SDC_INTRA
    35693559        bBestUseSDC   = false;
    35703560#endif
    … …  
    36033593    //--- update overall distortion ---
    36043594    uiOverallDistY += uiBestPUDistY;
    3605 #if NH_3D_INTRA_SDC
     3595#if NH_3D_SDC_INTRA
    36063596    if( bBestUseSDC )
    36073597    {
    … …  
    36253615      ::memcpy( pcCU->getCbf( compID  ) + uiPartOffset, m_puhQTTempCbf[compID], uiQPartNum * sizeof( UChar ) );
    36263616      ::memcpy( pcCU->getTransformSkip( compID  ) + uiPartOffset, m_puhQTTempTransformSkipFlag[compID ], uiQPartNum * sizeof( UChar ) );
    3627 #if NH_3D_INTRA_SDC
     3617#if NH_3D_SDC_INTRA
    36283618    }
    36293619#endif
    … …  
    36623652    //=== update PU data ====
    36633653    pcCU->setIntraDirSubParts     ( CHANNEL_TYPE_LUMA, uiBestPUMode, uiPartOffset, uiDepth + uiInitTrDepth );
    3664 #if NH_3D_INTRA_SDC
     3654#if NH_3D_SDC_INTRA
    36653655    pcCU->setSDCFlagSubParts          ( bBestUseSDC, uiPartOffset, uiDepth + uiInitTrDepth );
    36663656#endif
    … …  
    61856175#endif
    61866176
    6187 #if NH_3D_INTRA_SDC
     6177#if NH_3D_SDC_INTRA
    61886178  Bool bNonSkip = false;
    61896179#else
    … …  
    72497239    m_pcEntropyCoder->encodePartSize( pcCU, 0, pcCU->getDepth(0), true );
    72507240    m_pcEntropyCoder->encodePredInfo( pcCU, 0 );
    7251 #if NH_3D_INTRA_SDC
     7241#if NH_3D_SDC_INTRA
    72527242    m_pcEntropyCoder->encodeSDCFlag( pcCU, 0, true );
    72537243#endif
    … …  
    77927782#endif
    77937783#if TEMP_SDC_CLEANUP // PM: consider this cleanup for SDC
    7794 #if NH_3D_INTRA_SDC
     7784#if NH_3D_SDC_INTRA
    77957785Void TEncSearch::xCalcConstantSDC( Pel* ptrSrc, UInt srcStride, UInt uiSize, Pel& valDC )
    77967786{

  • branches/HTM-14.1-update-dev1-RWTH/source/Lib/TLibEncoder/TEncSearch.h

    r1221 r1227  
    356356  Void xSearchDmm1Wedge           ( TComDataCU* pcCU, UInt uiAbsPtIdx, Pel* piRef, UInt uiRefStride, UInt uiWidth, UInt uiHeight, UInt& ruiTabIdx );
    357357#endif
    358 #if NH_3D_INTRA_SDC
     358#if NH_3D_SDC_INTRA
    359359  Void xIntraCodingSDC            ( TComDataCU* pcCU, UInt uiAbsPartIdx, TComYuv* pcOrgYuv, TComYuv* pcPredYuv, Dist& ruiDist, Double& dRDCost, Bool bZeroResidual, Int iSDCDeltaResi    );
    360360#endif
    361361#if TEMP_SDC_CLEANUP // PM: consider this cleanup for SDC
    362 #if NH_3D_INTRA_SDC
     362#if NH_3D_SDC_INTRA
    363363  Void xCalcConstantSDC           ( Pel* ptrSrc, UInt srcStride, UInt uiSize, Pel& valDC );
    364364#endif
Note: See TracChangeset for help on using the changeset viewer.