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

Timestamp:

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

Author:

seregin

Message:

splitting parameter sets for layers

Location:

branches/HM-10.0-dev-SHM/source/Lib/TLibCommon

Files:

• TComSlice.cpp (modified) (5 diffs)
• TComSlice.h (modified) (2 diffs)

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

@@ -44 +44 @@
 //! \ingroup TLibCommon
 //! \{
+
+#if SVC_EXTENSION
+  ParameterSetMap<TComVPS> ParameterSetManager::m_vpsMap(MAX_NUM_VPS);
+  Int ParameterSetManager::m_activeVPSId = -1;
+#endif
 
 TComSlice::TComSlice()
@@ -1904 +1909 @@
 
 ParameterSetManager::ParameterSetManager()
+#if SVC_EXTENSION
+: m_spsMap(MAX_NUM_SPS)
+, m_ppsMap(MAX_NUM_PPS)
+, m_activeSPSId(-1)
+, m_activePPSId(-1)
+#else
 : m_vpsMap(MAX_NUM_VPS)
 , m_spsMap(MAX_NUM_SPS)
@@ -1910 +1921 @@
 , m_activeSPSId(-1)
 , m_activePPSId(-1)
+#endif
 {
 }
@@ -1946 +1958 @@
 //! activate a PPS and depending on isIDR parameter also SPS and VPS
 //! \returns true, if activation is successful
-#if SVC_EXTENSION
-Bool ParameterSetManager::activatePPS(Int ppsId, Bool isIDR, UInt layerId)
-#else
 Bool ParameterSetManager::activatePPS(Int ppsId, Bool isIDR)
-#endif
 {
   TComPPS *pps = m_ppsMap.getPS(ppsId);
@@ -1956 +1964 @@
   {
     Int spsId = pps->getSPSId();
-#if SVC_EXTENSION
-    if (!isIDR && (spsId != layerId ))
-#else
     if (!isIDR && (spsId != m_activeSPSId))
-#endif
     {
       printf("Warning: tried to activate PPS referring to a inactive SPS at non-IDR.");

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;