Changeset 1443 in SHVCSoftware

Timestamp:

13 Aug 2015, 19:17:31 (9 years ago)

Author:

seregin

Message:

port rev 4591

Location:

branches/SHM-dev/source/Lib

Files:

• TLibCommon/TComPicSym.cpp (modified) (1 diff)
• TLibEncoder/TEncPreanalyzer.cpp (modified) (3 diffs)

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

@@ -166 +166 @@
   clearSliceBuffer();
 
-  for (Int i = 0; i < m_numCtusInFrame; i++)
-  {
-    m_pictureCtuArray[i]->destroy();
-    delete m_pictureCtuArray[i];
-    m_pictureCtuArray[i] = NULL;
-  }
-  delete [] m_pictureCtuArray;
-  m_pictureCtuArray = NULL;
+  if (m_pictureCtuArray)
+  {
+    for (Int i = 0; i < m_numCtusInFrame; i++)
+    {
+      if (m_pictureCtuArray[i])
+      {
+        m_pictureCtuArray[i]->destroy();
+        delete m_pictureCtuArray[i];
+        m_pictureCtuArray[i] = NULL;
+      }
+    }
+    delete [] m_pictureCtuArray;
+    m_pictureCtuArray = NULL;
+  }
 
   delete [] m_ctuTsToRsAddrMap;

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

@@ -87 +87 @@
         UInt64 uiSum[4] = {0, 0, 0, 0};
         UInt64 uiSumSq[4] = {0, 0, 0, 0};
-        UInt uiNumPixInAQPart = 0;
         UInt by = 0;
         for ( ; by < uiCurrAQPartHeight>>1; by++ )
         {
           UInt bx = 0;
-          for ( ; bx < uiCurrAQPartWidth>>1; bx++, uiNumPixInAQPart++ )
+          for ( ; bx < uiCurrAQPartWidth>>1; bx++ )
           {
             uiSum  [0] += pBlkY[bx];
             uiSumSq[0] += pBlkY[bx] * pBlkY[bx];
           }
-          for ( ; bx < uiCurrAQPartWidth; bx++, uiNumPixInAQPart++ )
+          for ( ; bx < uiCurrAQPartWidth; bx++ )
           {
             uiSum  [1] += pBlkY[bx];
@@ -107 +106 @@
         {
           UInt bx = 0;
-          for ( ; bx < uiCurrAQPartWidth>>1; bx++, uiNumPixInAQPart++ )
+          for ( ; bx < uiCurrAQPartWidth>>1; bx++ )
           {
             uiSum  [2] += pBlkY[bx];
             uiSumSq[2] += pBlkY[bx] * pBlkY[bx];
           }
-          for ( ; bx < uiCurrAQPartWidth; bx++, uiNumPixInAQPart++ )
+          for ( ; bx < uiCurrAQPartWidth; bx++ )
           {
             uiSum  [3] += pBlkY[bx];
@@ -120 +119 @@
         }
 
+        assert ((uiCurrAQPartWidth&1)==0);
+        assert ((uiCurrAQPartHeight&1)==0);
+        const UInt pixelWidthOfQuadrants  = uiCurrAQPartWidth >>1;
+        const UInt pixelHeightOfQuadrants = uiCurrAQPartHeight>>1;
+        const UInt numPixInAQPart         = pixelWidthOfQuadrants * pixelHeightOfQuadrants;
+
         Double dMinVar = DBL_MAX;
-        for ( Int i=0; i<4; i++)
+        if (numPixInAQPart!=0)
         {
-          const Double dAverage = Double(uiSum[i]) / uiNumPixInAQPart;
-          const Double dVariance = Double(uiSumSq[i]) / uiNumPixInAQPart - dAverage * dAverage;
-          dMinVar = min(dMinVar, dVariance);
+          for ( Int i=0; i<4; i++)
+          {
+            const Double dAverage = Double(uiSum[i]) / numPixInAQPart;
+            const Double dVariance = Double(uiSumSq[i]) / numPixInAQPart - dAverage * dAverage;
+            dMinVar = min(dMinVar, dVariance);
+          }
+        }
+        else
+        {
+          dMinVar = 0.0;
         }
         const Double dActivity = 1.0 + dMinVar;