Changeset 778 in SHVCSoftware for branches/SHM-6-dev/source/Lib/TLibDecoder/TDecCAVLC.cpp

Timestamp:

28 May 2014, 13:26:07 (11 years ago)

Author:

nokia

Message:

JCTVC-Q0078/R0042: Additional layer sets and independent non-base layer rewriting tool (utils/BLRewrite)

File:

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

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

@@ -1187 +1187 @@
   }
 #endif
+#if Q0078_ADD_LAYER_SETS
+#if O0092_0094_DEPENDENCY_CONSTRAINT // Moved here
+  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
+  vps->setPredictedLayerIds();
+  vps->setTreePartitionLayerIdList();
+#endif
 #if VPS_TSLAYERS
   READ_FLAG( uiCode, "vps_sub_layers_max_minus1_present_flag"); vps->setMaxTSLayersPresentFlag(uiCode ? true : false);
@@ -1274 +1289 @@
 #endif
 
+#if Q0078_ADD_LAYER_SETS
+  if (vps->getNumIndependentLayers() > 1)
+  {
+    READ_UVLC(uiCode, "num_add_layer_sets"); vps->setNumAddLayerSets(uiCode);
+    for (Int i = 0; i < vps->getNumAddLayerSets(); i++)
+    {
+      for (Int 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);
+      }
+    }
+
+    for (Int i = 0; i < vps->getNumAddLayerSets(); i++)
+    {
+      for (Int j = 1; j < vps->getNumIndependentLayers(); j++)
+      {
+        Int layerNum = 0;
+        Int lsIdx = vps->getNumLayerSets() + i;
+        for (Int layerId = 0; layerId <= 62; layerId++)
+        {
+          vps->setLayerIdIncludedFlag(false, lsIdx, layerId);
+          for (Int treeIdx = 1; treeIdx < vps->getNumIndependentLayers(); treeIdx++)
+          {
+            for (Int layerCnt = 0; layerCnt < vps->getHighestLayerIdxPlus1(i, j); layerCnt++)
+            {
+              vps->setLayerSetLayerIdList(lsIdx, layerNum, vps->getTreePartitionLayerId(treeIdx, layerCnt));
+              vps->setLayerIdIncludedFlag(true, lsIdx, vps->getTreePartitionLayerId(treeIdx, layerCnt));
+              layerNum++;
+            }
+          }
+        }
+        vps->setNumLayersInIdList(lsIdx, layerNum);
+      }
+    }
+  }
+#endif
+
 #if !VPS_EXTN_UEV_CODING
   READ_FLAG( uiCode, "more_output_layer_sets_than_default_flag" ); vps->setMoreOutputLayerSetsThanDefaultFlag( uiCode ? true : false );
@@ -1676 +1733 @@
   }
 #endif
-#if O0092_0094_DEPENDENCY_CONSTRAINT
+#if !Q0078_ADD_LAYER_SETS
+#if O0092_0094_DEPENDENCY_CONSTRAINT // Moved up
   vps->setNumRefLayers();
 
@@ -1686 +1744 @@
     }
   }
+#endif
 #endif