Changeset 1428 in SHVCSoftware

Timestamp:

5 Aug 2015, 20:23:53 (9 years ago)

Author:

seregin

Message:

fix memory allocation

Location:

branches/SHM-dev/source/Lib

Files:

• TLibCommon/TComPic.cpp (modified) (2 diffs)
• TLibCommon/TComPicYuv.h (modified) (1 diff)
• TLibDecoder/TDecTop.cpp (modified) (1 diff)
• TLibEncoder/TEncGOP.cpp (modified) (1 diff)

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

@@ -239 +239 @@
 Void TComPic::createMvScalingFactor(UInt numOfILRPs)
 {
-  assert(m_mvScalingFactor[0] == NULL);
+  // picture object might be reused and hence m_mvScalingFactor[0] can be already allocated
+  if(m_mvScalingFactor[0])
+  {
+    delete m_mvScalingFactor[0];
+  }
   m_mvScalingFactor[0] = new Int[numOfILRPs];
 
-  assert(m_mvScalingFactor[1] == NULL);
+  // picture object might be reused and hence m_mvScalingFactor[1] can be already allocated
+  if(m_mvScalingFactor[1])
+  {
+    delete m_mvScalingFactor[1];
+  }
   m_mvScalingFactor[1] = new Int[numOfILRPs];
 }
@@ -248 +256 @@
 Void TComPic::createPosScalingFactor(UInt numOfILRPs)
 {
-  assert(m_posScalingFactor[0] == NULL);
+  // picture object might be reused and hence m_posScalingFactor[0] can be already allocated
+  if(m_posScalingFactor[0])
+  {
+    delete m_posScalingFactor[0];
+  }
   m_posScalingFactor[0] = new Int[numOfILRPs];
 
-  assert(m_posScalingFactor[1] == NULL);
+  // picture object might be reused and hence m_posScalingFactor[1] can be already allocated
+  if(m_posScalingFactor[1])
+  {
+    delete m_posScalingFactor[1];
+  }
   m_posScalingFactor[1] = new Int[numOfILRPs];
 }

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

@@ -186 +186 @@
   
 #if SVC_EXTENSION
-  Void          setHeight   ( Int picHeight )                    { m_picHeight = picHeight;                 }
+  Void          setHeight( Int picHeight )                       { m_picHeight = picHeight;                 }
   Window&       getConformanceWindow()                           { return  m_conformanceWindow;             }
   Void          setConformanceWindow(Window& conformanceWindow ) { m_conformanceWindow = conformanceWindow; }

branches/SHM-dev/source/Lib/TLibDecoder/TDecTop.cpp

@@ -1599 +1599 @@
     {
       // create buffers for scaling factors
-      m_pcPic->createMvScalingFactor(pcSlice->getNumILRRefIdx());
-      m_pcPic->createPosScalingFactor(pcSlice->getNumILRRefIdx());
+      if( pcSlice->getNumILRRefIdx() )
+      {
+        m_pcPic->createMvScalingFactor(pcSlice->getNumILRRefIdx());
+        m_pcPic->createPosScalingFactor(pcSlice->getNumILRRefIdx());
+      }
 
       for( Int i = 0; i < pcSlice->getNumILRRefIdx(); i++ )

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

@@ -1735 +1735 @@
       {
         // create buffers for scaling factors
-        pcSlice->getPic()->createMvScalingFactor(pcSlice->getNumILRRefIdx());
-        pcSlice->getPic()->createPosScalingFactor(pcSlice->getNumILRRefIdx());
+        if( pcSlice->getNumILRRefIdx() )
+        {
+          pcSlice->getPic()->createMvScalingFactor(pcSlice->getNumILRRefIdx());
+          pcSlice->getPic()->createPosScalingFactor(pcSlice->getNumILRRefIdx());
+        }
       }