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

Timestamp:

8 Jul 2015, 01:45:57 (10 years ago)

Author:

seregin

Message:

macro cleanup: Q0078_ADD_LAYER_SETS

File:

• branches/SHM-dev/source/Lib/TLibDecoder/TDecCAVLC.cpp (modified) (10 diffs)

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

@@ -1046 +1046 @@
   assert( pcVPS->getMaxLayerId()       < MAX_NUM_LAYER_IDS );
   READ_CODE( 6, uiCode, "vps_max_layer_id" );           pcVPS->setMaxLayerId( uiCode );
-#if Q0078_ADD_LAYER_SETS
   READ_UVLC(uiCode, "vps_num_layer_sets_minus1");  pcVPS->setVpsNumLayerSetsMinus1(uiCode);
   pcVPS->setNumLayerSets(pcVPS->getVpsNumLayerSetsMinus1() + 1);
+
   for (UInt opsIdx = 1; opsIdx <= pcVPS->getVpsNumLayerSetsMinus1(); opsIdx++)
-#else
-  READ_UVLC(    uiCode, "vps_num_layer_sets_minus1" );  pcVPS->setNumLayerSets( uiCode + 1 );
-  for( UInt opsIdx = 1; opsIdx <= ( pcVPS->getNumLayerSets() - 1 ); opsIdx ++ )
-#endif
   {
     // Operation point set
@@ -1455 +1451 @@
       }
 #if DPB_CONSTRAINTS
-      if(pcSlice->getVPS()->getVpsExtensionFlag()==1)
-      {
-#if Q0078_ADD_LAYER_SETS
-        for (Int ii = 1; ii < (pcSlice->getVPS()->getVpsNumLayerSetsMinus1() + 1); ii++)  // prevent assert error when num_add_layer_sets > 0
-#else
-        for (Int ii=1; ii< pcSlice->getVPS()->getNumOutputLayerSets(); ii++ )
-#endif
+      if( pcSlice->getVPS()->getVpsExtensionFlag() == 1 )
+      {
+        for( Int ii = 1; ii < (pcSlice->getVPS()->getVpsNumLayerSetsMinus1() + 1); ii++ )  // prevent assert error when num_add_layer_sets > 0
         {
           Int layerSetIdxForOutputLayerSet = pcSlice->getVPS()->getOutputLayerSetIdx( ii );
@@ -1472 +1464 @@
             }
           }
-          if(chkAssert)
+
+          if( chkAssert )
           {
             UInt layerIdc = pcSlice->getVPS()->getLayerIdcForOls( ii, pcSlice->getLayerId() );
@@ -1480 +1473 @@
           }
         }
-
-
-      }
+      }
+
       if(pcSlice->getLayerId() == 0)
       {
@@ -2785 +2777 @@
   }
 
-#if Q0078_ADD_LAYER_SETS
 #if O0092_0094_DEPENDENCY_CONSTRAINT // Moved here
   vps->setNumRefLayers();
@@ -2799 +2790 @@
   vps->setPredictedLayerIds();
   vps->setTreePartitionLayerIdList();
-#endif
-#if Q0078_ADD_LAYER_SETS
-  if (vps->getNumIndependentLayers() > 1)
+
+  if( vps->getNumIndependentLayers() > 1 )
   {
     READ_UVLC(uiCode, "num_add_layer_sets"); vps->setNumAddLayerSets(uiCode);
-    for (i = 0; i < vps->getNumAddLayerSets(); i++)
-    {
-      for (j = 1; j < vps->getNumIndependentLayers(); j++)
-      {
-        int len = 1;
-        while ((1 << len) < (vps->getNumLayersInTreePartition(j) + 1))
+
+    for( i = 0; i < vps->getNumAddLayerSets(); i++ )
+    {
+      for( j = 1; j < vps->getNumIndependentLayers(); j++ )
+      {
+        Int len = 1;
+        while( (1 << len) < (vps->getNumLayersInTreePartition(j) + 1) )
         {
           len++;
         }
+
         READ_CODE(len, uiCode, "highest_layer_idx_plus1[i][j]"); vps->setHighestLayerIdxPlus1(i, j, uiCode);
       }
@@ -2823 +2815 @@
     vps->setNumAddLayerSets(0);
   }
-#endif
 
   READ_FLAG( uiCode, "vps_sub_layers_max_minus1_present_flag"); vps->setMaxTSLayersPresentFlag(uiCode ? true : false);
@@ -2937 +2928 @@
     Int layerSetIdxForOutputLayerSet = vps->getOutputLayerSetIdx(i);
 
-#if Q0078_ADD_LAYER_SETS
     if( i > vps->getVpsNumLayerSetsMinus1() || vps->getDefaultTargetOutputLayerIdc() == 2 )
-#else
-    if( i > (vps->getNumLayerSets() - 1) || vps->getDefaultTargetOutputLayerIdc() == 2 )
-#endif
     {
       for( j = 0; j < vps->getNumLayersInIdList(layerSetIdxForOutputLayerSet); j++ )
@@ -3126 +3113 @@
     }
   }
-
-#if !Q0078_ADD_LAYER_SETS
-#if O0092_0094_DEPENDENCY_CONSTRAINT // Moved up
-  vps->setNumRefLayers();
-
-  if(vps->getMaxLayers() > MAX_REF_LAYERS)
-  {
-    for(i = 1;i < vps->getMaxLayers(); i++)
-    {
-      assert( vps->getNumRefLayers(vps->getLayerIdInNuh(i)) <= MAX_REF_LAYERS);
-    }
-  }
-#endif
-#endif
 
   READ_UVLC( uiCode,           "vps_non_vui_extension_length"); vps->setVpsNonVuiExtLength((Int)uiCode);
@@ -3603 +3576 @@
       parseHrdParameters(vps->getBspHrd(i), i==0 ? 1 : vps->getBspCprmsPresentFlag(i), vps->getMaxTLayers()-1);
     }
-#if Q0078_ADD_LAYER_SETS
     for (UInt h = 1; h <= vps->getVpsNumLayerSetsMinus1(); h++)
-#else
-    for( UInt h = 1; h <= (vps->getNumLayerSets()-1); h++ )
-#endif
     {
       READ_UVLC( uiCode, "num_bitstream_partitions[i]"); vps->setNumBitstreamPartitions(h, uiCode);