Changeset 1100 in SHVCSoftware for branches/SHM-dev/source/Lib/TLibDecoder

Timestamp:

6 Jul 2015, 20:20:51 (10 years ago)

Author:

seregin

Message:

macro cleanup: RESOLUTION_BASED_DPB

Location:

branches/SHM-dev/source/Lib/TLibDecoder

Files:

• TDecCAVLC.cpp (modified) (4 diffs)
• TDecTop.cpp (modified) (4 diffs)
• TDecTop.h (modified) (2 diffs)

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

@@ -3424 +3424 @@
 #endif
 #endif
-#if RESOLUTION_BASED_DPB
-  vps->assignSubDpbIndices();
-#endif
   READ_FLAG(uiCode, "max_one_active_ref_layer_flag" );
   vps->setMaxOneActiveRefLayerFlag(uiCode);
@@ -3785 +3782 @@
 #endif
 
-#if !RESOLUTION_BASED_DPB
   vps->deriveNumberOfSubDpbs();
-#endif
+
   for(Int i = 1; i < vps->getNumOutputLayerSets(); i++)
   {
@@ -3843 +3839 @@
         }
         READ_UVLC( uiCode, "max_vps_num_reorder_pics[i][j]" );              vps->setMaxVpsNumReorderPics( i, j, uiCode);
-#if RESOLUTION_BASED_DPB
-        if( vps->getNumSubDpbs(layerSetIdxForOutputLayerSet) != vps->getNumLayersInIdList( layerSetIdxForOutputLayerSet ) )  
-        {
-          for(Int k = 0; k < vps->getNumLayersInIdList( layerSetIdxForOutputLayerSet ); k++)
-          {
-            READ_UVLC( uiCode, "max_vps_layer_dec_pic_buff_minus1[i][k][j]" ); vps->setMaxVpsLayerDecPicBuffMinus1( i, k, j, uiCode);
-          }
-        }
-        else  // vps->getNumSubDpbs(layerSetIdxForOutputLayerSet) == vps->getNumLayersInIdList( layerSetIdxForOutputLayerSet )
-        {          
-          for(Int k = 0; k < vps->getNumLayersInIdList( layerSetIdxForOutputLayerSet ); k++)
-          {
-            vps->setMaxVpsLayerDecPicBuffMinus1( i, k, j, vps->getMaxVpsDecPicBufferingMinus1( i, k, j));
-          }
-        }
-#endif
+
         READ_UVLC( uiCode, "max_vps_latency_increase_plus1[i][j]" );        vps->setMaxVpsLatencyIncreasePlus1( i, j, uiCode);
       }
@@ -3885 +3866 @@
       if( !vps->getSubLayerDpbInfoPresentFlag(i, j) )  // If sub-layer DPB information is NOT present
       {
-#if RESOLUTION_BASED_DPB
-        for(Int k = 0; k < vps->getNumSubDpbs(layerSetIdxForOutputLayerSet); k++)
-#else
         for(Int k = 0; k < vps->getNumLayersInIdList( layerSetIdxForOutputLayerSet ); k++)
-#endif
         {
           vps->setMaxVpsDecPicBufferingMinus1( i, k, j, vps->getMaxVpsDecPicBufferingMinus1( i, k, j - 1 ) );
         }
         vps->setMaxVpsNumReorderPics( i, j, vps->getMaxVpsNumReorderPics( i, j - 1) );
-#if RESOLUTION_BASED_DPB
-        for(Int k = 0; k < vps->getNumLayersInIdList( layerSetIdxForOutputLayerSet ); k++)
-        {
-          vps->setMaxVpsLayerDecPicBuffMinus1( i, k, j, vps->getMaxVpsLayerDecPicBuffMinus1( i, k, j - 1));
-        }
-#endif
         vps->setMaxVpsLatencyIncreasePlus1( i, j, vps->getMaxVpsLatencyIncreasePlus1( i, j - 1 ) );
       }

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

@@ -116 +116 @@
   m_firstPicInLayerDecodedFlag = false;  
 #endif
-#if RESOLUTION_BASED_DPB
-  m_subDpbIdx = -1;
-#endif
 #if POC_RESET_IDC_DECODER
   m_parseIdc = -1;
@@ -280 +277 @@
   else
   {
-#if RESOLUTION_BASED_DPB
-    Int layerSetIdxForOutputLayerSet = pcSlice->getVPS()->getOutputLayerSetIdx( getCommonDecoderParams()->getTargetOutputLayerSetIdx() );
-    Int layerIdx = pcSlice->getVPS()->findLayerIdxInLayerSet( layerSetIdxForOutputLayerSet, pcSlice->getLayerId() );  assert( layerIdx != -1 );
-    m_iMaxRefPicNum = pcSlice->getVPS()->getMaxVpsLayerDecPicBuffMinus1( getCommonDecoderParams()->getTargetOutputLayerSetIdx(), layerIdx, pcSlice->getTLayer() ) + 1; // m_uiMaxDecPicBuffering has the space for the picture currently being decoded
-#else
     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
-#endif
   }
 #else
@@ -759 +750 @@
   checkValueOfTargetOutputLayerSetIdx( m_apcSlicePilot->getVPS());
 #endif
-#endif
-#if RESOLUTION_BASED_DPB
-  // Following assignment should go wherever a new VPS is activated
-  assignSubDpbs(m_apcSlicePilot->getVPS());
 #endif
   m_apcSlicePilot->initSlice( nalu.m_layerId );
@@ -2836 +2823 @@
 }
 #endif
-#if RESOLUTION_BASED_DPB
-Void TDecTop::assignSubDpbs(TComVPS *vps)
-{
-  if( m_subDpbIdx == -1 ) // Sub-DPB index is not already assigned
-  {
-    Int lsIdx = vps->getOutputLayerSetIdx( getCommonDecoderParams()->getTargetOutputLayerSetIdx() );
-
-    Int layerIdx = vps->findLayerIdxInLayerSet( lsIdx, getLayerId() );
-    assert( layerIdx != -1 ); // Current layer should be found in the layer set.
-
-    // Copy from the active VPS based on the layer ID.
-    m_subDpbIdx = vps->getSubDpbAssigned( lsIdx, layerIdx );
-  }
-}
-#endif
+
 #if POC_RESET_IDC_DECODER
 Void TDecTop::markAllPicsAsNoCurrAu(TComVPS *vps)

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

@@ -168 +168 @@
   Int                     m_prevPicOrderCnt;
 #endif
-#if RESOLUTION_BASED_DPB
-  Int                     m_subDpbIdx;     // Index to the sub-DPB that the layer belongs to.
-                                           // When new VPS is activated, this should be re-initialized to -1
-#endif
 #if CONFORMANCE_BITSTREAM_MODE
   Bool m_confModeFlag;
@@ -293 +289 @@
   ParameterSetManagerDecoder* getParameterSetManager() { return &m_parameterSetManagerDecoder; }
 #endif
-#if RESOLUTION_BASED_DPB
-  Void setSubDpbIdx(Int idx)    { m_subDpbIdx = idx; }
-  Int  getSubDpbIdx()           { return m_subDpbIdx; }
-  Void assignSubDpbs(TComVPS *vps);
-#endif
 #if CONFORMANCE_BITSTREAM_MODE
   std::vector<TComPic>* getConfListPic() {return &m_confListPic; }