Changeset 862 in SHVCSoftware for branches/SHM-dev/source/Lib/TLibEncoder/TEncCavlc.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/TLibEncoder/TEncCavlc.cpp (modified) (3 diffs)

branches/SHM-dev/source/Lib/TLibEncoder/TEncCavlc.cpp

@@ -1006 +1006 @@
   }
 #endif
+#if MOVE_ADDN_LS_SIGNALLING
+#if Q0078_ADD_LAYER_SETS
+  if (vps->getNumIndependentLayers() > 1)
+  {
+    WRITE_UVLC( vps->getNumAddLayerSets(), "num_add_layer_sets" );
+    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++;
+        }
+        WRITE_CODE(vps->getHighestLayerIdxPlus1(i, j), len, "highest_layer_idx_plus1[i][j]");
+      }
+    }
+  }
+#endif
+#endif
 #if VPS_TSLAYERS
     WRITE_FLAG( vps->getMaxTSLayersPresentFlag(), "vps_sub_layers_max_minus1_present_flag");
@@ -1056 +1076 @@
 #endif
 
+
+#if !MOVE_ADDN_LS_SIGNALLING
 #if Q0078_ADD_LAYER_SETS
   if (vps->getNumIndependentLayers() > 1)
@@ -1073 +1095 @@
     }
   }
+#endif
 #endif