Changeset 829 in SHVCSoftware for branches/SHM-dev

Timestamp:

14 Jul 2014, 21:12:28 (10 years ago)

Author:

seregin

Message:

memory release

File:

• branches/SHM-dev/source/App/TAppEncoder/TAppEncCfg.cpp (modified) (11 diffs)

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

@@ -97 +97 @@
 {
 #if SVC_EXTENSION
-  free(m_pBitstreamFile);
+  if( m_pBitstreamFile )
+  {
+    free(m_pBitstreamFile);
+    m_pBitstreamFile = NULL;
+  }
 #else  
   if ( m_aidQP )
@@ -1163 +1167 @@
   }
 #if SVC_EXTENSION
+  if( pColumnWidth )
+  {
+    free( pColumnWidth );
+    pColumnWidth = NULL;
+  }
+
+  if( pRowHeight )
+  {
+    free( pRowHeight );
+    pRowHeight = NULL;
+  }
+
   for(Int layer = 0; layer < MAX_LAYERS; layer++)
   {
@@ -1305 +1321 @@
       m_acLayerCfg[layer].m_samplePredRefLayerIds = NULL;
     }
+
+    if( pSamplePredRefLayerIds )
+    {
+      free( pSamplePredRefLayerIds );
+      pSamplePredRefLayerIds = NULL;
+    }
   }
   for(Int layer = 0; layer < MAX_LAYERS; layer++)
@@ -1336 +1358 @@
       m_acLayerCfg[layer].m_motionPredRefLayerIds = NULL;
     }
+
+    if( pMotionPredRefLayerIds )
+    {
+      free( pMotionPredRefLayerIds );
+      pMotionPredRefLayerIds = NULL;
+    }
   }
 
@@ -1375 +1403 @@
       m_acLayerCfg[layer].m_predLayerIds = NULL;
     }
+
+    if( pPredLayerIds )
+    {
+      free( pPredLayerIds );
+      pPredLayerIds = NULL;
+    }
   }
 #endif
@@ -1396 +1430 @@
         i++;
       }
+
+      if( layerSetLayerIdListDup )
+      {
+        free( layerSetLayerIdListDup );
+        layerSetLayerIdListDup = NULL;
+      }
     }
   }
@@ -1415 +1455 @@
         layerIdx = strtok(NULL, " ,-");
         i++;
+      }
+
+      if( highestLayrIdxListDup )
+      {
+        free( highestLayrIdxListDup );
+        highestLayrIdxListDup = NULL;
       }
     }
@@ -1601 +1647 @@
       m_targetPivotValue = NULL;
     }
+
+    if( pcStartOfCodedInterval )
+    {
+      free( pcStartOfCodedInterval );
+      pcStartOfCodedInterval = NULL;
+    }
+
+    if( pcCodedPivotValue )
+    {
+      free( pcCodedPivotValue );
+      pcCodedPivotValue = NULL;
+    }
+
+    if( pcTargetPivotValue )
+    {
+      free( pcTargetPivotValue );
+      pcTargetPivotValue = NULL;
+    }
   }
 #if P0050_KNEE_FUNCTION_SEI
@@ -1626 +1690 @@
       i++;
     }
+
+    if( pcInputKneePointValue )
+    {
+      free( pcInputKneePointValue );
+      pcInputKneePointValue = NULL;
+    }
+
+    if( pcOutputKneePointValue )
+    {
+      free( pcOutputKneePointValue );
+      pcOutputKneePointValue = NULL;
+    }
   }
 #endif
@@ -1671 +1747 @@
     }
     m_skippedTileSetPresentFlag = false;
+
+    if( pTileSets )
+    {
+      free( pTileSets );
+      pTileSets = NULL;
+    }
   }
 #endif
@@ -3139 +3221 @@
     *arr = NULL;
   }
+
+  if( tempChar )
+  {
+    free( tempChar );
+    tempChar = NULL;
+  }
 }