Changeset 1489 in SHVCSoftware

Timestamp:

2 Dec 2015, 23:30:10 (9 years ago)

Author:

seregin

Message:

store VPS with a picture, VPS is a static pointer for now

Location:

branches/SHM-dev/source/Lib

Files:

• TLibCommon/TComPicSym.cpp (modified) (3 diffs)
• TLibCommon/TComPicSym.h (modified) (1 diff)
• TLibDecoder/TDecTop.cpp (modified) (1 diff)
• TLibEncoder/TEncAnalyze.h (modified) (1 diff)

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

@@ -47 +47 @@
 // ====================================================================================================================
 
+#if SVC_EXTENSION
+TComVPS* TComPicSym::m_vps = NULL;
+#endif
+
 TComPicSym::TComPicSym()
 :m_frameWidthInCtus(0)
@@ -83 +87 @@
   m_sps = sps;
   m_pps = pps;
-  m_vps = &vps;
+
+  if( !m_vps )
+  {
+    m_vps = new TComVPS(vps);
+  }
+  else  
+  {
+    *m_vps = vps;
+  }
 
   const ChromaFormat chromaFormatIDC = vps.getChromaFormatIdc(&sps, layerId);
@@ -210 +222 @@
   delete [] m_pParentARLBuffer;
   m_pParentARLBuffer = NULL;
+#endif
+
+#if SVC_EXTENSION
+  if( m_vps )
+  {
+    delete m_vps;
+    m_vps = NULL;
+  }
 #endif
 }

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

@@ -121 +121 @@
   
 #if SVC_EXTENSION
-  const TComVPS* m_vps;
+  // SHM: temporal solution to keep VPS with a picture, ideally it should be picture specific, but currently sizeof(TComVPS) = 232897716
+  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

branches/SHM-dev/source/Lib/TLibDecoder/TDecTop.cpp

@@ -260 +260 @@
   }
 
-  m_iMaxRefPicNum += 1; // it should be updated if more than 1 resampling picture is used
+  m_iMaxRefPicNum += 1; // SHM: it should be updated if more than 1 resampling picture is used
 #else
   m_iMaxRefPicNum = sps.getMaxDecPicBuffering(temporalLayer);     // m_uiMaxDecPicBuffering has the space for the picture currently being decoded

branches/SHM-dev/source/Lib/TLibEncoder/TEncAnalyze.h

@@ -145 +145 @@
     Double dScale   = dFps / 1000 / (Double)m_uiNumPic;
 
+#if SVC_EXTENSION
+    // SHM: to avoid compiler warning of possible usage of uninitialized variable
+    Double MSEBasedSNR[MAX_NUM_COMPONENT] = {0, };
+#else
     Double MSEBasedSNR[MAX_NUM_COMPONENT];
+#endif
     if (printMSEBasedSNR)
     {