Changeset 1540 in SHVCSoftware for branches/SHM-dev/source/Lib/TLibCommon

Timestamp:

22 Mar 2016, 23:10:27 (10 years ago)

Author:

seregin

Message:

port rev 4692

Location:

branches/SHM-dev/source/Lib/TLibCommon

Files:

• TComPic.cpp (modified) (2 diffs)
• TComPicSym.cpp (modified) (5 diffs)
• TComPicSym.h (modified) (1 diff)
• TComPicYuv.cpp (modified) (2 diffs)
• TComYuv.cpp (modified) (1 diff)

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

@@ -75 +75 @@
 TComPic::~TComPic()
 {
+  destroy();
 }
 #if SVC_EXTENSION
 Void TComPic::create( const TComSPS &sps, const TComPPS &pps, const Bool bIsVirtual, const UInt layerId )
 {
+  destroy();
+
   const ChromaFormat chromaFormatIDC = sps.getChromaFormatIdc();
   const Int          iWidth          = sps.getPicWidthInLumaSamples();
@@ -116 +119 @@
 Void TComPic::create( const TComSPS &sps, const TComPPS &pps, const Bool bIsVirtual)
 {
+  destroy();
+
   const ChromaFormat chromaFormatIDC = sps.getChromaFormatIdc();
   const Int          iWidth          = sps.getPicWidthInLumaSamples();

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

@@ -77 +77 @@
 {}
 
+
+TComPicSym::~TComPicSym()
+{
+  destroy();
+}
+
 #if SVC_EXTENSION
 Void TComPicSym::create  ( const TComSPS &sps, const TComPPS &pps, UInt uiMaxDepth, const UInt layerId )
@@ -84 +90 @@
 {
 #endif
-  UInt i;
+  destroy();
+
   m_sps = sps;
   m_pps = pps;
@@ -91 +98 @@
   const Int iPicWidth      = sps.getPicWidthInLumaSamples();
   const Int iPicHeight     = sps.getPicHeightInLumaSamples();
-
   const UInt uiMaxCuWidth  = sps.getMaxCUWidth();
   const UInt uiMaxCuHeight = sps.getMaxCUHeight();
@@ -124 +130 @@
 #endif
 
-  for ( i=0; i<m_numCtusInFrame ; i++ )
+  for (UInt i=0; i<m_numCtusInFrame ; i++ )
   {
     m_pictureCtuArray[i] = new TComDataCU;
@@ -144 +150 @@
 #endif  
 
-  for( i=0; i<m_numCtusInFrame; i++ )
+  for(UInt i=0; i<m_numCtusInFrame; i++ )
   {
     m_ctuTsToRsAddrMap[i] = i;

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

@@ -140 +140 @@
 
   TComPicSym  ();
+  ~TComPicSym();
+
   TComSlice*         getSlice(UInt i)                                      { return m_apSlices[i];             }
   const TComSlice*   getSlice(UInt i) const                                { return m_apSlices[i];             }

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

@@ -74 +74 @@
 TComPicYuv::~TComPicYuv()
 {
+  destroy();
 }
 
@@ -90 +91 @@
 
 {
+  destroy();
 
 #if SVC_EXTENSION

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

@@ -59 +59 @@
 TComYuv::~TComYuv()
 {
+  destroy();
 }
 
 Void TComYuv::create( UInt iWidth, UInt iHeight, ChromaFormat chromaFormatIDC )
 {
+  destroy();
   // set width and height
   m_iWidth   = iWidth;