Changeset 1178 in SHVCSoftware

Timestamp:

8 Jul 2015, 02:44:55 (9 years ago)

Author:

seregin

Message:

macro cleanup: USE_DPB_SIZE_TABLE

Location:

branches/SHM-dev/source/Lib

Files:

• TLibCommon/TypeDef.h (modified) (1 diff)
• TLibDecoder/TDecTop.cpp (modified) (5 diffs)

branches/SHM-dev/source/Lib/TLibCommon/TypeDef.h

@@ -123 +123 @@
 
 #define VPS_DPB_SIZE_TABLE               1      ///< JCTVC-O0217: DPB operations: signaling DPB-related parameters
-#if VPS_DPB_SIZE_TABLE 
-#define USE_DPB_SIZE_TABLE               1      ///< JCTVC-O0217: DPB operations: Use signaled DPB-size table parameters in the decoder
-#endif
+
 #define DPB_PARAMS_MAXTLAYERS            1      ///< JCTVC-P0156 DPB parameters up to maximum temporal sub-layers in the layer set
 #define NO_CLRAS_OUTPUT_FLAG             1

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

@@ -247 +247 @@
   for( Int temporalLayer=0; temporalLayer < MAX_TLAYER; temporalLayer++)
   {
-#if USE_DPB_SIZE_TABLE
+#if SVC_EXTENSION
     if( m_commonDecoderParams->getTargetOutputLayerSetIdx() == 0 )
     {
@@ -264 +264 @@
   }
 
-#if USE_DPB_SIZE_TABLE
+#if SVC_EXTENSION
   if( m_commonDecoderParams->getTargetOutputLayerSetIdx() == 0 )
   {
@@ -274 +274 @@
     m_iMaxRefPicNum = pcSlice->getVPS()->getMaxVpsDecPicBufferingMinus1( m_commonDecoderParams->getTargetOutputLayerSetIdx(), pcSlice->getVPS()->getLayerIdcForOls( pcSlice->getVPS()->getOutputLayerSetIdx( m_commonDecoderParams->getTargetOutputLayerSetIdx()), pcSlice->getLayerId() ), pcSlice->getTLayer() ) + 1; // m_uiMaxDecPicBuffering has the space for the picture currently being decoded
   }
+
+  m_iMaxRefPicNum += 1; // it should be updated if more than 1 resampling picture is used
 #else
   m_iMaxRefPicNum = pcSlice->getSPS()->getMaxDecPicBuffering(pcSlice->getTLayer());     // m_uiMaxDecPicBuffering has the space for the picture currently being decoded
 #endif
-
-#if SVC_EXTENSION
-  m_iMaxRefPicNum += 1; // it should be updated if more than 1 resampling picture is used
-#endif
-
+  
   if (m_cListPic.size() < (UInt)m_iMaxRefPicNum)
   {
@@ -2370 +2368 @@
     Window defaultDisplayWindow = pcSPS->getVuiParametersPresentFlag() ? pcSPS->getVuiParameters()->getDefaultDisplayWindow() : Window();
 
-    for( Int temporalLayer=0; temporalLayer < MAX_TLAYER; temporalLayer++) 
-    {
-#if USE_DPB_SIZE_TABLE
-      if( getCommonDecoderParams()->getTargetOutputLayerSetIdx() == 0 )
+    for( Int temporalLayer=0; temporalLayer < MAX_TLAYER; temporalLayer++ ) 
+    {
+      if( m_commonDecoderParams->getTargetOutputLayerSetIdx() == 0 )
       {
         assert( this->getLayerId() == 0 );
@@ -2384 +2381 @@
         numReorderPics[temporalLayer] = vps->getMaxVpsNumReorderPics( getCommonDecoderParams()->getTargetOutputLayerSetIdx() , temporalLayer);
       }
-#else
-      numReorderPics[temporalLayer] = pcSPS->getNumReorderPics(temporalLayer);
-#endif
     }