Changeset 1509 in SHVCSoftware

Timestamp:

12 Dec 2015, 03:55:59 (9 years ago)

Author:

seregin

Message:

correct VPS setting, memory leak fix

Location:

branches/SHM-dev/source

Files:

• App/TAppEncoder/TAppEncCfg.cpp (modified) (2 diffs)
• App/TAppEncoder/TAppEncLayerCfg.cpp (modified) (1 diff)
• Lib/TLibEncoder/TEncSlice.cpp (modified) (2 diffs)

branches/SHM-dev/source/App/TAppEncoder/TAppEncCfg.cpp

@@ -182 +182 @@
   for( Int layer = 0; layer < m_numLayers; layer++ )
   {
-    if( m_apcLayerCfg[layer]->m_numSamplePredRefLayers > 0 )
-    {
-      delete [] m_apcLayerCfg[layer]->m_samplePredRefLayerIds;
-      m_apcLayerCfg[layer]->m_samplePredRefLayerIds = NULL;
-    }
-    if( m_apcLayerCfg[layer]->m_numMotionPredRefLayers > 0 )
-    {
-      delete [] m_apcLayerCfg[layer]->m_motionPredRefLayerIds;
-      m_apcLayerCfg[layer]->m_motionPredRefLayerIds = NULL;
-    }
-    if( m_apcLayerCfg[layer]->m_numActiveRefLayers > 0 )
-    {
-      delete [] m_apcLayerCfg[layer]->m_predLayerIds;
-      m_apcLayerCfg[layer]->m_predLayerIds = NULL;
-    }
     if( m_apcLayerCfg[layer] )
     {
@@ -2632 +2617 @@
 #endif
     Int* m_aiPad                    = m_apcLayerCfg[layer]->m_aiPad;
-    Int* m_aidQP                    = m_apcLayerCfg[layer]->m_aidQP;
+    Int*& m_aidQP                   = m_apcLayerCfg[layer]->m_aidQP;
 
     Int& m_iSourceWidth             = m_apcLayerCfg[layer]->m_iSourceWidth;

branches/SHM-dev/source/App/TAppEncoder/TAppEncLayerCfg.cpp

@@ -60 +60 @@
 TAppEncLayerCfg::~TAppEncLayerCfg()
 {
-  if ( m_aidQP )
+  if( m_numSamplePredRefLayers > 0 )
   {
-    delete[] m_aidQP;
+    delete [] m_samplePredRefLayerIds;
+    m_samplePredRefLayerIds = NULL;
+  }
+
+  if( m_numMotionPredRefLayers > 0 )
+  {
+    delete [] m_motionPredRefLayerIds;
+    m_motionPredRefLayerIds = NULL;
+  }
+
+  if( m_numActiveRefLayers > 0 )
+  {
+    delete [] m_predLayerIds;
+    m_predLayerIds = NULL;
+  }
+
+  if( m_aidQP )
+  {
+    delete [] m_aidQP;
   }
 }

branches/SHM-dev/source/Lib/TLibEncoder/TEncSlice.cpp

@@ -243 +243 @@
   UInt layerId = pcPic->getLayerId();
   rpcSlice->initSlice( layerId );
+
+  // VPS is used later by accessing from the slice getter
+  rpcSlice->setVPS(m_ppcTEncTop[0]->getVPS());
 #else
   rpcSlice->initSlice();
@@ -552 +555 @@
 
 #if SVC_EXTENSION
-  // VPS is used later by accessing from the slice getter
-  rpcSlice->setVPS(m_ppcTEncTop[0]->getVPS());
-
   if( layerId > 0 )
   {