Ticket #67: MemLeak_SIFO.patch

TEncSIFO.cpp

@@ -62 +62 @@
   SequenceAccErrorP     = NULL;                    // [Filter][Sppos]
   SequenceAccErrorB     = NULL;                    // [FilterF][FilterB][SpposF][SpposB]
   SIFO_FILTER           = NULL;                    // [num_SIFO][16 subpels][SQR_FILTER]
+#ifdef FIX_TICKET67
+  m_pcPredSearch = NULL;
+#if USE_DIAGONAL_FILT==1
+  SIFO_FILTER_DIAG = NULL;
+#endif
+#endif
 }
 TEncSIFO::~TEncSIFO()
 {
 }
+
+#ifdef FIX_TICKET67
+Void TEncSIFO::destropy()
+{
+        if( m_pcPredSearch != NULL )
+        {
+                UInt num_SIFO = m_pcPredSearch->getNum_SIFOFilters();
+                xFree_mem2Ddouble(AccErrorP);
+                xFree_mem2Ddouble(SequenceAccErrorP);
+                xFree_mem4Ddouble(SequenceAccErrorB, num_SIFO, num_SIFO);
+                xFree_mem3Ddouble(SIFO_FILTER, num_SIFO);
+#if USE_DIAGONAL_FILT==1
+                xFree_mem2Ddouble(SIFO_FILTER_DIAG);
+#endif
+        }
+}
+#endif
+
 // ====================================================================================================================
 // Public member functions
 // ====================================================================================================================
@@ -601 +625 @@
   return idx*frames*rows*columns*sizeof(Double);
 }
 
+#ifdef FIX_TICKET67
+Void TEncSIFO::xFree_mem2Ddouble(Double **array2D)
+{
+        if(array2D)
+        {
+                if(array2D[0]) 
+                        free (array2D[0]);
+                else 
+                {
+                        printf("xFree_mem2Ddouble: trying to free unused memory");
+                        exit(100);
+                }
+                free (array2D);
+        } 
+}
+
+Void TEncSIFO::xFree_mem3Ddouble(Double ***array3D, Int frames)
+{
+        int i;
+
+        if(array3D)
+        {
+                for(i=0;i<frames;i++)
+                { 
+                        xFree_mem2Ddouble(array3D[i]);
+                }
+                free(array3D);
+        } 
+}
+
+Void TEncSIFO::xFree_mem4Ddouble(Double ****array4D, Int idx, Int frames)
+{
+        int  j;
+
+        if(array4D)
+        {
+                for(j=0;j<idx;j++)
+                        xFree_mem3Ddouble( array4D[j], frames) ;
+                free(array4D);
+        } 
+}
+#endif
+
 Void TEncSIFO::xResetSequenceFilters()
 {
   Int i; 

TEncSIFO.h

@@ -45 +45 @@
 class TEncTop;
 class TEncGOP;
 
+#define FIX_TICKET67
+
 // ====================================================================================================================
 // Class definition
 // ====================================================================================================================
@@ -69 +71 @@
   Int xGet_mem2Ddouble(Double ***array2D, Int rows, Int columns);
   Int xGet_mem3Ddouble(Double ****array3D, Int frames, Int rows, Int columns);
   Int xGet_mem4Ddouble(Double *****array4D, Int idx, Int frames, Int rows, Int columns );
+#ifdef FIX_TICKET67
+  Void xFree_mem2Ddouble(Double **array2D);
+  Void xFree_mem3Ddouble(Double ***array3D, Int frames);
+  Void xFree_mem4Ddouble(Double ****array4D, Int idx, Int frames);
+#endif
   Double  xComputeImgSum                        ( Pel* img,                                                                             Int width, Int height, Int stride               );      ///< compute sum of pixel values
   Void xResetAll(TComSlice* pcSlice);
   Void xResetSequenceFilters();
@@ -96 +103 @@
 public:
   TEncSIFO();
   virtual ~TEncSIFO();
+#ifdef FIX_TICKET67
+  Void destropy();
+#endif
 
   Void    init                                                          ( TEncTop* pcEncTop, Int Tap);
   Void    initEncSIFO                             ( TComSlice*& rpcSlice );