Changeset 1224 in SHVCSoftware for branches/SHM-dev/source/App

Timestamp:

9 Jul 2015, 00:12:33 (10 years ago)

Author:

seregin

Message:

macro cleanup: VPS_DPB_SIZE_TABLE

File:

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

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

@@ -1465 +1465 @@
 
   // Target output layer
-#if VPS_DPB_SIZE_TABLE
   vps->deriveNumberOfSubDpbs();
   vps->setOutputLayerFlag( 0, 0, 1 );
@@ -1525 +1524 @@
     }
   }
-#endif
-
-    vps->setMaxOneActiveRefLayerFlag(maxDirectRefLayers > 1 ? false : true);
-
-    // POC LSB not present flag
-    for( i = 1; i< vps->getMaxLayers(); i++ )
-    {
-      if( vps->getNumDirectRefLayers( vps->getLayerIdInNuh(i) ) == 0  )
-      {
-        // make independedent layers base-layer compliant
-        vps->setPocLsbNotPresentFlag(i, true); 
-      }
-    }
-
-    vps->setCrossLayerPictureTypeAlignFlag( m_crossLayerPictureTypeAlignFlag );
-    vps->setCrossLayerAlignedIdrOnlyFlag( m_crossLayerAlignedIdrOnlyFlag );
-    vps->setCrossLayerIrapAlignFlag( m_crossLayerIrapAlignFlag );
-    for(UInt layerCtr = 1;layerCtr <= vps->getMaxLayers() - 1; layerCtr++)
-    {
-      for(Int refLayerCtr = 0; refLayerCtr < layerCtr; refLayerCtr++)
-      {
-        if (vps->getDirectDependencyFlag( layerCtr, refLayerCtr))
+
+  vps->setMaxOneActiveRefLayerFlag(maxDirectRefLayers > 1 ? false : true);
+
+  // POC LSB not present flag
+  for( i = 1; i< vps->getMaxLayers(); i++ )
+  {
+    if( vps->getNumDirectRefLayers( vps->getLayerIdInNuh(i) ) == 0  )
+    {
+      // make independedent layers base-layer compliant
+      vps->setPocLsbNotPresentFlag(i, true); 
+    }
+  }
+
+  vps->setCrossLayerPictureTypeAlignFlag( m_crossLayerPictureTypeAlignFlag );
+  vps->setCrossLayerAlignedIdrOnlyFlag( m_crossLayerAlignedIdrOnlyFlag );
+  vps->setCrossLayerIrapAlignFlag( m_crossLayerIrapAlignFlag );
+  for(UInt layerCtr = 1;layerCtr <= vps->getMaxLayers() - 1; layerCtr++)
+  {
+    for(Int refLayerCtr = 0; refLayerCtr < layerCtr; refLayerCtr++)
+    {
+      if (vps->getDirectDependencyFlag( layerCtr, refLayerCtr))
+      {
+        if(m_acTEncTop[layerCtr].getIntraPeriod() !=  m_acTEncTop[refLayerCtr].getIntraPeriod())
         {
-          if(m_acTEncTop[layerCtr].getIntraPeriod() !=  m_acTEncTop[refLayerCtr].getIntraPeriod())
-          {
-            vps->setCrossLayerIrapAlignFlag(false);
-            break;
-          }
+          vps->setCrossLayerIrapAlignFlag(false);
+          break;
         }
       }
     }
+  }
   vps->setSingleLayerForNonIrapFlag(m_adaptiveResolutionChange > 0 ? true : false);
   vps->setHigherLayerIrapSkipFlag(m_skipPictureAtArcSwitch);