Changeset 872 in SHVCSoftware for branches/SHM-dev/source/Lib/TLibCommon

Timestamp:

18 Aug 2014, 22:31:55 (11 years ago)

Author:

qualcomm

Message:

Move calculation of MaxSubLayerInLayerSets to a separate function (Macro: SUB_LAYERS_IN_LAYER_SET)

From: Adarsh K. Ramasubramonian <aramasub@…>

Location:

branches/SHM-dev/source/Lib/TLibCommon

Files:

• TComSlice.cpp (modified) (1 diff)
• TComSlice.h (modified) (1 diff)
• TypeDef.h (modified) (1 diff)

branches/SHM-dev/source/Lib/TLibCommon/TComSlice.cpp

@@ -3140 +3140 @@
   }
   return numBits;
+}
+#endif
+#if SUB_LAYERS_IN_LAYER_SET
+Void TComVPS::calculateMaxSLInLayerSets()
+{
+  for(Int lsIdx = 0; lsIdx < getNumLayerSets(); lsIdx++)
+  {
+    UInt maxSLMinus1 = 0;
+    for(Int k = 0; k < getNumLayersInIdList(lsIdx); k++ ) {
+      Int  lId = getLayerSetLayerIdList(lsIdx, k);
+      maxSLMinus1 = std::max(maxSLMinus1, getMaxTSLayersMinus1(getLayerIdInVps(lId)));
+    }
+    setMaxSLayersInLayerSetMinus1(lsIdx,maxSLMinus1);
+  }
 }
 #endif

branches/SHM-dev/source/Lib/TLibCommon/TComSlice.h

@@ -1314 +1314 @@
   Void  checkNecessaryLayerFlagCondition();
 #endif
+#if SUB_LAYERS_IN_LAYER_SET
+  Void  calculateMaxSLInLayerSets();
+#endif
 #endif //SVC_EXTENSION
 };

branches/SHM-dev/source/Lib/TLibCommon/TypeDef.h

@@ -60 +60 @@
 #endif
 #define BSP_INIT_ARRIVAL_SEI             1      ///< JCTVC-R0231: Make signalling of vcl_initial_arrival_delay independent of NalHrdBpPresentFlag
+#define SUB_LAYERS_IN_LAYER_SET          1      ///< Move calculation of MaxSubLayerInLayerSets to a separate function
 #define O0137_MAX_LAYERID                1      ///< JCTVC-O0137, JCTVC-O0200, JCTVC-O0223: restrict nuh_layer_id and vps_max_layers_minus1