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

Timestamp:

15 Jul 2014, 04:20:03 (11 years ago)

Author:

seregin

Message:

make parameter sets static

Location:

branches/SHM-dev/source/Lib/TLibCommon

Files:

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

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

@@ -47 +47 @@
 #if SVC_EXTENSION
 ParameterSetMap<TComVPS> ParameterSetManager::m_vpsMap(MAX_NUM_VPS);
+ParameterSetMap<TComSPS> ParameterSetManager::m_spsMap(MAX_NUM_SPS);
+ParameterSetMap<TComPPS> ParameterSetManager::m_ppsMap(MAX_NUM_PPS);
 Int ParameterSetManager::m_activeVPSId = -1;
 #endif
@@ -3679 +3681 @@
 ParameterSetManager::ParameterSetManager()
 #if SVC_EXTENSION
-: m_spsMap(MAX_NUM_SPS)
-, m_ppsMap(MAX_NUM_PPS)
-, m_activeSPSId(-1)
+: m_activeSPSId(-1)
 , m_activePPSId(-1)
 #else

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

@@ -2514 +2514 @@
     if ( m_paramsetMap.find(psId) != m_paramsetMap.end() )
     {
-#if Q0078_ADD_LAYER_SETS
-      m_paramsetMap.erase(psId);
-#endif
       delete m_paramsetMap[psId];
     }
@@ -2542 +2539 @@
   }
 
-#if Q0078_ADD_LAYER_SETS
-  Void removePS(Int psId)
-  {
-    assert(psId < m_maxId);
-    if (m_paramsetMap.find(psId) != m_paramsetMap.end())
-    {
-      m_paramsetMap.erase(psId);
-#if Q0078_ADD_LAYER_SETS
-      delete m_paramsetMap[psId];
-#endif
-    }
-  }
-#endif
-
-
 private:
   std::map<Int,T *> m_paramsetMap;
@@ -2579 +2561 @@
   TComSPS* getSPS(Int spsId)  { return m_spsMap.getPS(spsId); };
   TComSPS* getFirstSPS()      { return m_spsMap.getFirstPS(); };
-#if Q0078_ADD_LAYER_SETS
-  Void     removeSPS(Int spsId) { m_spsMap.removePS(spsId); };
-#endif
 
   //! store picture parameter set and take ownership of it 
@@ -2588 +2567 @@
   TComPPS* getPPS(Int ppsId)  { return m_ppsMap.getPS(ppsId); };
   TComPPS* getFirstPPS()      { return m_ppsMap.getFirstPS(); };
-#if Q0078_ADD_LAYER_SETS
-  Void     removePPS(Int ppsId) { m_ppsMap.removePS(ppsId); };
-#endif
 
   //! activate a SPS from a active parameter sets SEI message
@@ -2608 +2584 @@
 #if SVC_EXTENSION
   static ParameterSetMap<TComVPS> m_vpsMap;
+  static ParameterSetMap<TComSPS> m_spsMap; 
+  static ParameterSetMap<TComPPS> m_ppsMap;
 #else
   ParameterSetMap<TComVPS> m_vpsMap;
-#endif
   ParameterSetMap<TComSPS> m_spsMap; 
   ParameterSetMap<TComPPS> m_ppsMap;
+#endif
 
 #if SVC_EXTENSION