Changeset 90 in SHVCSoftware for branches/HM-10.0-dev-SHM/source/Lib/TLibCommon/TComSlice.h

Timestamp:

20 Mar 2013, 22:00:39 (12 years ago)

Author:

seregin

Message:

splitting parameter sets for layers

File:

• branches/HM-10.0-dev-SHM/source/Lib/TLibCommon/TComSlice.h (modified) (2 diffs)

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

@@ -1676 +1676 @@
   //! activate a PPS and depending on isIDR parameter also SPS and VPS
   //! \returns true, if activation is successful
-#if SVC_EXTENSION
-  Bool activatePPS(Int ppsId, Bool isIDR, UInt layerId);
-#else
   Bool activatePPS(Int ppsId, Bool isIDR);
-#endif
 
   TComVPS* getActiveVPS(){ return m_vpsMap.getPS(m_activeVPSId); };
@@ -1687 +1683 @@
 
 protected:
-  
+
+#if SVC_EXTENSION
+  static ParameterSetMap<TComVPS> m_vpsMap;
+#else
   ParameterSetMap<TComVPS> m_vpsMap;
+#endif
   ParameterSetMap<TComSPS> m_spsMap; 
   ParameterSetMap<TComPPS> m_ppsMap;
 
+#if SVC_EXTENSION
+  static Int m_activeVPSId;
+#else
   Int m_activeVPSId;
+#endif
   Int m_activeSPSId;
   Int m_activePPSId;