Ignore:
Timestamp:
22 May 2013, 21:05:43 (11 years ago)
Author:
tech
Message:

Merged HTM-6.2-dev3-RWTH-Fix Rev. 415

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/HTM-6.2-dev0/source/Lib/TLibDecoder/TDecEntropy.cpp

    r427 r433  
    130130  m_pcEntropyDecoderIf->parsePredMode( pcCU, uiAbsPartIdx, uiDepth );
    131131 
     132#if !PKU_QC_DEPTH_INTRA_UNI_D0195
    132133#if RWTH_SDC_DLT_B0036
    133134  // if B-Slice, code SDC flag later
     
    138139  }
    139140#endif
     141#endif
    140142}
    141143
    142144Void TDecEntropy::decodePartSize( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth )
    143145{
     146#if !PKU_QC_DEPTH_INTRA_UNI_D0195
    144147#if RWTH_SDC_DLT_B0036
    145148  if( !pcCU->getSlice()->isInterB() && pcCU->isIntra(uiAbsPartIdx) && pcCU->getSDCFlag(uiAbsPartIdx)  )
     
    150153  }
    151154#endif
     155#endif
    152156 
    153157  m_pcEntropyDecoderIf->parsePartSize( pcCU, uiAbsPartIdx, uiDepth );
    154158 
     159#if !PKU_QC_DEPTH_INTRA_UNI_D0195
    155160#if RWTH_SDC_DLT_B0036
    156161  if( pcCU->getSlice()->isInterB() && pcCU->getSlice()->getSPS()->isDepth() && pcCU->isIntra(uiAbsPartIdx) )
     
    167172  }
    168173#endif
     174#endif
    169175}
    170176
    171177Void TDecEntropy::decodePredInfo    ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth, TComDataCU* pcSubCU )
    172178{
     179#if !PKU_QC_DEPTH_INTRA_UNI_D0195
    173180#if RWTH_SDC_DLT_B0036
    174181  if( pcCU->getSDCFlag(uiAbsPartIdx) )
     
    177184    return;
    178185  }
     186#endif
    179187#endif
    180188 
     
    191199      decodeIntraDirModeLuma( pcCU, uiAbsPartIdx + uiPartOffset*2, uiDepth+1 );
    192200      decodeIntraDirModeLuma( pcCU, uiAbsPartIdx + uiPartOffset*3, uiDepth+1 );
     201#if PKU_QC_DEPTH_INTRA_UNI_D0195
     202      if(!pcCU->getSDCFlag(uiAbsPartIdx))
     203#endif
    193204      decodeIntraDirModeChroma( pcCU, uiAbsPartIdx, uiDepth );
    194205    }
     
    196207    {
    197208      decodeIntraDirModeLuma  ( pcCU, uiAbsPartIdx, uiDepth );
     209#if PKU_QC_DEPTH_INTRA_UNI_D0195
     210      if(!pcCU->getSDCFlag(uiAbsPartIdx))
     211#endif
    198212      decodeIntraDirModeChroma( pcCU, uiAbsPartIdx, uiDepth );
    199213    }
     
    852866    assert( pcCU->getCbf(uiAbsPartIdx, TEXT_CHROMA_U) == 1 );
    853867    assert( pcCU->getCbf(uiAbsPartIdx, TEXT_CHROMA_V) == 1 );
    854    
    855868    decodeSDCResidualData(pcCU, uiAbsPartIdx, uiDepth);
     869#endif
    856870    return;
    857871  }
     
    910924
    911925#if RWTH_SDC_DLT_B0036
     926#if !PKU_QC_DEPTH_INTRA_UNI_D0195
    912927Void TDecEntropy::decodeSDCPredMode( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth )
    913928{
     
    924939  m_pcEntropyDecoderIf->parseSDCFlag(pcCU, uiAbsPartIdx, uiDepth );
    925940}
    926 
    927941Void TDecEntropy::decodeSDCResidualData( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth )
    928942{
Note: See TracChangeset for help on using the changeset viewer.