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

Timestamp:

12 Aug 2014, 01:48:03 (10 years ago)

Author:

qualcomm

Message:

JCTVC-R0238: (Ed.) Move additional layer set signalling in VPS extn. (Macro: MOVE_ADDN_LS_SIGNALLING)

From: Adarsh K. Ramasubramonian <aramasub@…>

File:

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

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

@@ -1281 +1281 @@
   vps->setTreePartitionLayerIdList();
 #endif
+#if MOVE_ADDN_LS_SIGNALLING
+#if Q0078_ADD_LAYER_SETS
+  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))
+        {
+          len++;
+        }
+        READ_CODE(len, uiCode, "highest_layer_idx_plus1[i][j]"); vps->setHighestLayerIdxPlus1(i, j, uiCode);
+      }
+    }
+    vps->setNumLayerSets(vps->getNumLayerSets() + vps->getNumAddLayerSets());
+    vps->setLayerIdIncludedFlagsForAddLayerSets();
+  }
+#endif
+#endif
 #if VPS_TSLAYERS
   READ_FLAG( uiCode, "vps_sub_layers_max_minus1_present_flag"); vps->setMaxTSLayersPresentFlag(uiCode ? true : false);
@@ -1366 +1388 @@
 #endif
 
+#if !MOVE_ADDN_LS_SIGNALLING
 #if Q0078_ADD_LAYER_SETS
   if (vps->getNumIndependentLayers() > 1)
@@ -1385 +1408 @@
     vps->setLayerIdIncludedFlagsForAddLayerSets();
   }
+#endif
 #endif