Changeset 1502 in SHVCSoftware for branches/SHM-dev/source/Lib/TLibDecoder/TDecCu.cpp

Timestamp:

11 Dec 2015, 00:05:48 (8 years ago)

Author:

seregin

Message:

infer parameters in SPS after activation, fixing chroma scaling for non 4:2:0

File:

• branches/SHM-dev/source/Lib/TLibDecoder/TDecCu.cpp (modified) (7 diffs)

branches/SHM-dev/source/Lib/TLibDecoder/TDecCu.cpp

@@ -219 +219 @@
   UInt uiBPelY   = uiTPelY + (maxCuHeight>>uiDepth) - 1;
 
-#if SVC_EXTENSION
-  TComSlice * pcSlice = pcPic->getSlice(pcPic->getCurrSliceIdx());
-
-  if( ( uiRPelX < pcSlice->getPicWidthInLumaSamples() ) && ( uiBPelY < pcSlice->getPicHeightInLumaSamples() ) )
-#else
   if( ( uiRPelX < sps.getPicWidthInLumaSamples() ) && ( uiBPelY < sps.getPicHeightInLumaSamples() ) )
-#endif
   {
     m_pcEntropyDecoder->decodeSplitFlag( pcCU, uiAbsPartIdx, uiDepth );
@@ -252 +246 @@
       uiTPelY   = pcCU->getCUPelY() + g_auiRasterToPelY[ g_auiZscanToRaster[uiIdx] ];
 
-#if SVC_EXTENSION
-      if ( !isLastCtuOfSliceSegment && ( uiLPelX < pcCU->getSlice()->getPicWidthInLumaSamples() ) && ( uiTPelY < pcCU->getSlice()->getPicHeightInLumaSamples() ) )
-#else
       if ( !isLastCtuOfSliceSegment && ( uiLPelX < sps.getPicWidthInLumaSamples() ) && ( uiTPelY < sps.getPicHeightInLumaSamples() ) )
-#endif
       {
         xDecodeCU( pcCU, uiIdx, uiDepth+1, isLastCtuOfSliceSegment );
@@ -404 +394 @@
   UInt uiBPelY   = uiTPelY + (sps.getMaxCUHeight()>>uiDepth) - 1;
 
-#if SVC_EXTENSION
-  if( ( uiRPelX >= pcSlice->getPicWidthInLumaSamples() ) || ( uiBPelY >= pcSlice->getPicHeightInLumaSamples() ) )
-#else
   if( ( uiRPelX >= sps.getPicWidthInLumaSamples() ) || ( uiBPelY >= sps.getPicHeightInLumaSamples() ) )
-#endif
   {
     bBoundary = true;
@@ -423 +409 @@
       uiTPelY = pCtu->getCUPelY() + g_auiRasterToPelY[ g_auiZscanToRaster[uiIdx] ];
 
-#if SVC_EXTENSION
-      if( ( uiLPelX < pcSlice->getPicWidthInLumaSamples() ) && ( uiTPelY < pcSlice->getPicHeightInLumaSamples() ) )
-#else
       if( ( uiLPelX < sps.getPicWidthInLumaSamples() ) && ( uiTPelY < sps.getPicHeightInLumaSamples() ) )
-#endif
       {
         xDecompressCU(pCtu, uiIdx, uiNextDepth );
@@ -501 +483 @@
   if  ( pcCU->getQtRootCbf( 0) )
   {
-#if SVC_EXTENSION
-    m_ppcYuvReco[uiDepth]->addClip( m_ppcYuvReco[uiDepth], m_ppcYuvResi[uiDepth], 0, pcCU->getWidth( 0 ), pcCU->getSlice()->getBitDepths() );
-#else
     m_ppcYuvReco[uiDepth]->addClip( m_ppcYuvReco[uiDepth], m_ppcYuvResi[uiDepth], 0, pcCU->getWidth( 0 ), pcCU->getSlice()->getSPS()->getBitDepths() );
-#endif
   }
   else
@@ -647 +625 @@
 #endif
 
-#if SVC_EXTENSION
-  const Int clipbd = pcCU->getSlice()->getBitDepth(toChannelType(compID));
-#else
   const Int clipbd = sps.getBitDepth(toChannelType(compID));
-#endif
 #if O0043_BEST_EFFORT_DECODING
   const Int bitDepthDelta = sps.getStreamBitDepth(toChannelType(compID)) - clipbd;
@@ -834 +808 @@
         Pel* piPicReco         = pcCU->getPic()->getPicYuvRec()->getAddr(compID, pcCU->getCtuRsAddr(), pcCU->getZorderIdxInCtu()+uiPartIdx);
   const UInt uiPicStride       = pcCU->getPic()->getPicYuvRec()->getStride(compID);
-#if SVC_EXTENSION
-  const UInt uiPcmLeftShiftBit = pcCU->getSlice()->getBitDepth(toChannelType(compID)) - pcCU->getSlice()->getSPS()->getPCMBitDepth(toChannelType(compID));
-#else
   const TComSPS &sps           = *(pcCU->getSlice()->getSPS());
   const UInt uiPcmLeftShiftBit = sps.getBitDepth(toChannelType(compID)) - sps.getPCMBitDepth(toChannelType(compID));
-#endif
 
   for(UInt uiY = 0; uiY < uiHeight; uiY++ )