Changeset 1496 in SHVCSoftware for branches

Timestamp:

3 Dec 2015, 18:40:14 (9 years ago)

Author:

seregin

Message:

make VPS a static member instead of pointer

Location:

branches/SHM-dev/source/Lib/TLibCommon

Files:

• TComPicSym.cpp (modified) (4 diffs)
• TComPicSym.h (modified) (2 diffs)

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

@@ -48 +48 @@
 
 #if SVC_EXTENSION
-TComVPS* TComPicSym::m_vps = NULL;
+TComVPS TComPicSym::m_vps;
 #endif
 
@@ -87 +87 @@
   m_sps = sps;
   m_pps = pps;
-
-  if( !m_vps )
-  {
-    m_vps = new TComVPS(vps);
-  }
-  else  
-  {
-    *m_vps = vps;
-  }
-
+  m_vps = vps;
+  
   const ChromaFormat chromaFormatIDC = vps.getChromaFormatIdc(&sps, layerId);
   const Int iPicWidth  = vps.getPicWidthInLumaSamples(&sps, layerId);
@@ -223 +215 @@
   m_pParentARLBuffer = NULL;
 #endif
-
-#if SVC_EXTENSION
-  if( m_vps )
-  {
-    delete m_vps;
-    m_vps = NULL;
-  }
-#endif
 }
 
@@ -239 +223 @@
   m_apSlices.back()->setSPS(&m_sps);
 #if SVC_EXTENSION
-  m_apSlices.back()->setVPS(m_vps);
+  m_apSlices.back()->setVPS(&m_vps);
 #endif
   if (m_apSlices.size()>=2)

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

@@ -122 +122 @@
 #if SVC_EXTENSION
   // SHM: temporal solution to keep VPS with a picture, ideally it should be picture specific, but currently sizeof(TComVPS) = 232897716
-  static TComVPS* m_vps;
+  static TComVPS m_vps;
 #if N0383_IL_CONSTRAINED_TILE_SETS_SEI
   Int*           m_piTileSetIdxMap;     //the map of the tile set index relative to LCU raster scan address
@@ -155 +155 @@
 
 #if SVC_EXTENSION
-  TComSlice *        swapSliceObject(TComSlice* p, UInt i)                 { p->setVPS(m_vps); p->setSPS(&m_sps); p->setPPS(&m_pps); TComSlice *pTmp=m_apSlices[i];m_apSlices[i] = p; pTmp->setVPS(0); pTmp->setSPS(0); pTmp->setPPS(0); return pTmp; }
+  TComSlice *        swapSliceObject(TComSlice* p, UInt i)                 { p->setVPS(&m_vps); p->setSPS(&m_sps); p->setPPS(&m_pps); TComSlice *pTmp=m_apSlices[i];m_apSlices[i] = p; pTmp->setVPS(0); pTmp->setSPS(0); pTmp->setPPS(0); return pTmp; }
 #else
   TComSlice *        swapSliceObject(TComSlice* p, UInt i)                 { p->setSPS(&m_sps); p->setPPS(&m_pps); TComSlice *pTmp=m_apSlices[i];m_apSlices[i] = p; pTmp->setSPS(0); pTmp->setPPS(0); return pTmp; }