Changeset 1185 in SHVCSoftware for branches/SHM-dev/source/App/TAppEncoder/TAppEncTop.cpp

Timestamp:

8 Jul 2015, 03:34:13 (9 years ago)

Author:

seregin

Message:

macro cleanup: VPS_VUI_BSP_HRD_PARAMS, R0227_VUI_BSP_HRD_FLAG

File:

• branches/SHM-dev/source/App/TAppEncoder/TAppEncTop.cpp (modified) (3 diffs)

branches/SHM-dev/source/App/TAppEncoder/TAppEncTop.cpp

@@ -1595 +1595 @@
   vps->setHigherLayerIrapSkipFlag(m_skipPictureAtArcSwitch);
 
-  for (Int k = 0; k < MAX_VPS_LAYER_SETS_PLUS1; k++)
+  for( Int k = 0; k < MAX_VPS_LAYER_SETS_PLUS1; k++ )
   {
     vps->setAltOuputLayerFlag( k, m_altOutputLayerFlag );
   }
 
-#if VPS_VUI_BSP_HRD_PARAMS
+  // VPS VUI BSP HRD parameters
   vps->setVpsVuiBspHrdPresentFlag(false);
   TEncTop *pcCfg = &m_acTEncTop[0];
@@ -1640 +1640 @@
 
     // Signalling of additional partitioning schemes
-    for(Int h = 1; h < vps->getNumOutputLayerSets(); h++)
+    for( Int h = 1; h < vps->getNumOutputLayerSets(); h++ )
     {
       Int lsIdx = vps->getOutputLayerSetIdx( h );
@@ -1678 +1678 @@
     }
   }
-#else
-
-#if O0164_MULTI_LAYER_HRD
-  vps->setVpsVuiBspHrdPresentFlag(false);
-  TEncTop *pcCfg = &m_acTEncTop[0];
-  if( pcCfg->getBufferingPeriodSEIEnabled() )
-  {
-    vps->setVpsVuiBspHrdPresentFlag(true);
-    vps->setVpsNumBspHrdParametersMinus1(vps->getVpsNumLayerSetsMinus1() - 1); 
-    vps->createBspHrdParamBuffer(vps->getVpsNumBspHrdParametersMinus1() + 1);
-    for ( i = 0; i <= vps->getVpsNumBspHrdParametersMinus1(); i++ )
-    {
-      vps->setBspCprmsPresentFlag(i, true);
-
-      UInt layerId = i + 1;
-      TEncTop *pcCfgLayer = &m_acTEncTop[layerId];
-
-      Int iPicWidth         = pcCfgLayer->getSourceWidth();
-      Int iPicHeight        = pcCfgLayer->getSourceHeight();
-#if LAYER_CTB
-      UInt uiWidthInCU       = ( iPicWidth  % m_acLayerCfg[layerId].m_uiMaxCUWidth  ) ? iPicWidth  / m_acLayerCfg[layerId].m_uiMaxCUWidth  + 1 : iPicWidth  / m_acLayerCfg[layerId].m_uiMaxCUWidth;
-      UInt uiHeightInCU      = ( iPicHeight % m_acLayerCfg[layerId].m_uiMaxCUHeight ) ? iPicHeight / m_acLayerCfg[layerId].m_uiMaxCUHeight + 1 : iPicHeight / m_acLayerCfg[layerId].m_uiMaxCUHeight;
-#else
-      UInt uiWidthInCU       = ( iPicWidth %m_uiMaxCUWidth  ) ? iPicWidth /m_uiMaxCUWidth  + 1 : iPicWidth /m_uiMaxCUWidth;
-      UInt uiHeightInCU      = ( iPicHeight%m_uiMaxCUHeight ) ? iPicHeight/m_uiMaxCUHeight + 1 : iPicHeight/m_uiMaxCUHeight;
-#endif
-      UInt uiNumCUsInFrame   = uiWidthInCU * uiHeightInCU;
-
-#if LAYER_CTB
-      UInt maxCU = pcCfgLayer->getSliceArgument() >> ( m_acLayerCfg[layerId].m_uiMaxCUDepth << 1);
-#else
-      UInt maxCU = pcCfgLayer->getSliceArgument() >> ( m_uiMaxCUDepth << 1);
-#endif
-      UInt numDU = ( pcCfgLayer->getSliceMode() == 1 ) ? ( uiNumCUsInFrame / maxCU ) : ( 0 );
-      if( uiNumCUsInFrame % maxCU != 0 || numDU == 0 )
-      {
-        numDU ++;
-      }
-      vps->getBspHrd(i)->setNumDU( numDU );
-      vps->setBspHrdParameters( i, pcCfgLayer->getFrameRate(), numDU, pcCfgLayer->getTargetBitrate(), ( pcCfgLayer->getIntraPeriod() > 0 ) );
-    }
-    for (UInt h = 1; h <= vps->getVpsNumLayerSetsMinus1(); h++)
-    {
-      vps->setNumBitstreamPartitions(h, 1);
-      for( i = 0; i < vps->getNumBitstreamPartitions(h); i++ )
-      {
-        for( UInt j = 0; j <= (vps->getMaxLayers()-1); j++ )
-        {
-          if (vps->getLayerIdIncludedFlag(h, j) && h == j)
-          {
-            vps->setLayerInBspFlag(h, i, j, true);
-          }
-        }
-      }
-      vps->setNumBspSchedCombinations(h, 1);
-      for( i = 0; i < vps->getNumBspSchedCombinations(h); i++ )
-      {
-        for( UInt j = 0; j < vps->getNumBitstreamPartitions(h); j++ )
-        {
-          vps->setBspCombHrdIdx(h, i, j, 0);
-          vps->setBspCombSchedIdx(h, i, j, 0);
-        }
-      }
-    }
-  }
-#endif
-#endif
-
 #else //SVC_EXTENSION
   m_cTEncTop.init(isFieldCoding);