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

Timestamp:

17 Jul 2015, 05:43:37 (9 years ago)

Author:

seregin

Message:

port rev 4322 (g_bitDepth)

File:

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

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

@@ -499 +499 @@
   if  ( pcCU->getQtRootCbf( 0) )
   {
-    m_ppcYuvReco[uiDepth]->addClip( m_ppcYuvReco[uiDepth], m_ppcYuvResi[uiDepth], 0, pcCU->getWidth( 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
@@ -642 +646 @@
 #endif
 
+#if SVC_EXTENSION
+  const Int clipbd = pcCU->getSlice()->getBitDepth(toChannelType(compID));
+#else
+  const Int clipbd = pcCU->getSlice()->getSPS()->getBitDepth(toChannelType(compID));
+#endif
 #if O0043_BEST_EFFORT_DECODING
-  const Int bitDepthDelta = g_bitDepthInStream[toChannelType(compID)] - g_bitDepth[toChannelType(compID)];
-#endif
-  const Int clipbd = g_bitDepth[toChannelType(compID)];
+  const Int bitDepthDelta = pcCU->getSlice()->getSPS()->getStreamBitDepth(toChannelType(compID)) - clipbd;
+#endif
 
   if( useCrossComponentPrediction )
@@ -825 +833 @@
         Pel* piPicReco         = pcCU->getPic()->getPicYuvRec()->getAddr(compID, pcCU->getCtuRsAddr(), pcCU->getZorderIdxInCtu()+uiPartIdx);
   const UInt uiPicStride       = pcCU->getPic()->getPicYuvRec()->getStride(compID);
-  const UInt uiPcmLeftShiftBit = g_bitDepth[toChannelType(compID)] - pcCU->getSlice()->getSPS()->getPCMBitDepth(toChannelType(compID));
+#if SVC_EXTENSION
+  const UInt uiPcmLeftShiftBit = pcCU->getSlice()->getBitDepth(toChannelType(compID)) - pcCU->getSlice()->getSPS()->getPCMBitDepth(toChannelType(compID));
+#else
+  const UInt uiPcmLeftShiftBit = pcCU->getSlice()->getSPS()->getBitDepth(toChannelType(compID)) - pcCU->getSlice()->getSPS()->getPCMBitDepth(toChannelType(compID));
+#endif
 
   for(UInt uiY = 0; uiY < uiHeight; uiY++ )