Changeset 465 in 3DVCSoftware for branches/HTM-DEV-0.3-dev2a

Timestamp:

12 Jun 2013, 14:01:34 (12 years ago)

Author:

tech

Message:

Fixed some minor memory leaks.

Location:

branches/HTM-DEV-0.3-dev2a/source

Files:

• App/TAppDecoder/TAppDecTop.cpp (modified) (1 diff)
• App/TAppDecoder/TAppDecTop.h (modified) (1 diff)
• App/TAppEncoder/TAppEncTop.cpp (modified) (1 diff)
• Lib/TLibCommon/TypeDef.h (modified) (1 diff)
• Lib/TLibDecoder/TDecTop.cpp (modified) (2 diffs)
• Lib/TLibDecoder/TDecTop.h (modified) (3 diffs)
• Lib/TLibEncoder/TEncCu.cpp (modified) (1 diff)
• Lib/TLibEncoder/TEncGOP.cpp (modified) (1 diff)
• Lib/TLibEncoder/TEncTop.h (modified) (1 diff)

branches/HTM-DEV-0.3-dev2a/source/App/TAppDecoder/TAppDecTop.cpp

@@ -95 +95 @@
     m_pchReconFile = NULL;
   }
+#if H_3D_FIX
+  if (m_pchScaleOffsetFile)
+  {
+    free (m_pchScaleOffsetFile);
+    m_pchScaleOffsetFile = NULL; 
+  }
+#endif
 }
 

branches/HTM-DEV-0.3-dev2a/source/App/TAppDecoder/TAppDecTop.h

@@ -91 +91 @@
   Void  decode            (); ///< main decoding function
  
-#if H_3D_ARP
+#if H_3D_ARP              
+//GT (IVREFS): This is not needed any more. Reference picture can be obtained from m_ivPicLists. Should be fixed later.
   TDecTop* getTDecTop     ( Int layerId )          { return m_tDecTop[layerId]; }
 #endif

branches/HTM-DEV-0.3-dev2a/source/App/TAppEncoder/TAppEncTop.cpp

@@ -619 +619 @@
     m_acTEncTopList[layer]->init( );
 #if H_3D_ARP
+    //GT (IVREFS): This is not needed any more. Reference pictures can be obtained from m_ivPicLists. Should be fixed later. 
     m_acTEncTopList[layer]->setTAppEncTop( this );
 #endif

branches/HTM-DEV-0.3-dev2a/source/Lib/TLibCommon/TypeDef.h

@@ -91 +91 @@
 
 #define H_3D_ARP                          1   // Advanced residual prediction (ARP), JCT3V-D0177
+#define H_3D_FIX                          1   // Temporary for minor fixes
 #endif 
 

branches/HTM-DEV-0.3-dev2a/source/Lib/TLibDecoder/TDecTop.cpp

@@ -55 +55 @@
   m_aaiCodedScale          = new Int* [ MAX_NUM_LAYERS ];
   m_aiViewId               = new Int  [ MAX_NUM_LAYERS ];
+#if !H_3D_FIX  
   m_aiLayerIdx             = new Int  [ MAX_NUM_LAYERS ];
+#endif
 
   m_bViewReceived          = new Bool [ MAX_NUM_LAYERS ];
@@ -899 +901 @@
         if( iViewIdx<getViewIndex() && !bIsDepth )
         {
+          //GT (IVREFS): m_tAppDecTop is not needed any more. Reference pictures can be obtained from m_ivPicLists. Should be fixed later. 
           pcSlice->setBaseViewRefPicList( m_tAppDecTop->getTDecTop(iLayerId)->getListPic(), iViewIdx );
         }

branches/HTM-DEV-0.3-dev2a/source/Lib/TLibDecoder/TDecTop.h

@@ -89 +89 @@
   Int**   m_aaiCodedScale;
   Int*    m_aiViewId;  
+#if !H_3D_FIX  
   Int*    m_aiLayerIdx;
+#endif
 
   Bool*   m_bViewReceived;
@@ -225 +227 @@
 #endif
 
-#if H_3D_ARP
+#if H_3D_ARP 
+  //GT (IVREFS): This is not needed any more. Reference picture can be obtained from m_ivPicLists. Should be fixed later. 
   TAppDecTop*             m_tAppDecTop;
 #endif
@@ -271 +274 @@
 
 #if H_3D_ARP
+  //GT (IVREFS): This is not needed any more. Reference picture can be obtained from m_ivPicLists. Should be fixed later. 
   Void                    setTAppDecTop( TAppDecTop* pcTAppDecTop ) { m_tAppDecTop = pcTAppDecTop; }
   TAppDecTop*             getTAppDecTop()                           { return  m_tAppDecTop; }

branches/HTM-DEV-0.3-dev2a/source/Lib/TLibEncoder/TEncCu.cpp

@@ -177 +177 @@
     m_ppcTempCU = NULL;
   }
-  
+
+#if H_3D_ARP
+  if(m_ppcWeightedTempCU)
+  {
+    delete [] m_ppcWeightedTempCU; 
+    m_ppcWeightedTempCU = NULL; 
+  }
+#endif
   if(m_ppcPredYuvBest)
   {

branches/HTM-DEV-0.3-dev2a/source/Lib/TLibEncoder/TEncGOP.cpp

@@ -683 +683 @@
         if( iViewIdx<getViewIndex() && !bIsDepth )
         {
+          //GT (IVREFS): m_tAppEncTop is not needed any more. Reference pictures can be obtained from m_ivPicLists. Should be fixed later. 
           pcSlice->setBaseViewRefPicList( m_pcEncTop->getTAppEncTop()->getTEncTop( iLayerId )->getListPic(), iViewIdx );
         }

branches/HTM-DEV-0.3-dev2a/source/Lib/TLibEncoder/TEncTop.h

@@ -214 +214 @@
 #endif
 #if H_3D_ARP
+  //GT (IVREFS): m_tAppDecTop is not needed any more. Reference pictures can be obtained from m_ivPicLists. Should be fixed later. 
   Void            setTAppEncTop( TAppEncTop* pcTAppEncTop ) { m_pcTAppEncTop = pcTAppEncTop; }
   TAppEncTop*     getTAppEncTop()                           { return  m_pcTAppEncTop; }