Ignore:
Timestamp:
22 May 2015, 15:07:56 (10 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/Lib/TLibCommon
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • 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
Note: See TracChangeset for help on using the changeset viewer.