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/TLibDecoder
Files:
8 edited

Legend:

Unmodified
Added
Removed

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