Changeset 1397 in SHVCSoftware for branches/SHM-dev

Timestamp:

4 Aug 2015, 03:26:38 (9 years ago)

Author:

seregin

Message:

port rev 4550

Location:

branches/SHM-dev/source/Lib

Files:

• TLibCommon/TComRdCost.cpp (modified) (6 diffs)
• TLibCommon/TComRdCost.h (modified) (2 diffs)
• TLibCommon/TComRdCostWeightPrediction.cpp (modified) (3 diffs)
• TLibEncoder/TEncSearch.cpp (modified) (6 diffs)

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

@@ -194 +194 @@
   // initialize
   rcDistParam.iSubShift  = 0;
+  rcDistParam.m_maximumDistortionForEarlyExit = std::numeric_limits<Distortion>::max();
 }
 
@@ -210 +211 @@
   rcDistParam.iRows    = pcPatternKey->getROIYHeight();
   rcDistParam.DistFunc = m_afpDistortFunc[DF_SAD + g_aucConvertToBit[ rcDistParam.iCols ] + 1 ];
+  rcDistParam.m_maximumDistortionForEarlyExit = std::numeric_limits<Distortion>::max();
 
   if (rcDistParam.iCols == 12)
@@ -244 +246 @@
   rcDistParam.iCols    = pcPatternKey->getROIYWidth();
   rcDistParam.iRows    = pcPatternKey->getROIYHeight();
+
+  rcDistParam.m_maximumDistortionForEarlyExit = std::numeric_limits<Distortion>::max();
 
   // set distortion function
@@ -283 +287 @@
   rcDP.bitDepth     = bitDepth;
   rcDP.DistFunc     = m_afpDistortFunc[ ( bHadamard ? DF_HADS : DF_SADS ) + g_aucConvertToBit[ iWidth ] + 1 ];
+  rcDP.m_maximumDistortionForEarlyExit = std::numeric_limits<Distortion>::max();
 }
 
@@ -358 +363 @@
     return TComRdCostWeightPrediction::xGetSADw( pcDtParam );
   }
-  const Pel* piOrg   = pcDtParam->pOrg;
-  const Pel* piCur   = pcDtParam->pCur;
-  Int  iRows   = pcDtParam->iRows;
-  Int  iCols   = pcDtParam->iCols;
-  Int  iStrideCur = pcDtParam->iStrideCur;
-  Int  iStrideOrg = pcDtParam->iStrideOrg;
+  const Pel* piOrg           = pcDtParam->pOrg;
+  const Pel* piCur           = pcDtParam->pCur;
+  const Int  iCols           = pcDtParam->iCols;
+  const Int  iStrideCur      = pcDtParam->iStrideCur;
+  const Int  iStrideOrg      = pcDtParam->iStrideOrg;
+  const UInt distortionShift = DISTORTION_PRECISION_ADJUSTMENT(pcDtParam->bitDepth - 8);
 
   Distortion uiSum = 0;
 
-  for( ; iRows != 0; iRows-- )
+  for(Int iRows = pcDtParam->iRows ; iRows != 0; iRows-- )
   {
     for (Int n = 0; n < iCols; n++ )
@@ -373 +378 @@
       uiSum += abs( piOrg[n] - piCur[n] );
     }
-    piOrg += iStrideOrg;
-    piCur += iStrideCur;
-  }
-
-  return ( uiSum >> DISTORTION_PRECISION_ADJUSTMENT(pcDtParam->bitDepth-8) );
+    if (pcDtParam->m_maximumDistortionForEarlyExit < ( uiSum >> distortionShift ))
+    {
+      return ( uiSum >> distortionShift );
+    }
+    piOrg += iStrideOrg;
+    piCur += iStrideCur;
+  }
+
+  return ( uiSum >> distortionShift );
 }
 

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

@@ -81 +81 @@
   const WPScalingParam *wpCur;           // weighted prediction scaling parameters for current ref
   ComponentID           compIdx;
+  Distortion            m_maximumDistortionForEarlyExit; /// During cost calculations, if distortion exceeds this value, cost calculations may early-terminate.
 
   // (vertical) subsampling shift (for reducing complexity)
@@ -99 +100 @@
      wpCur(NULL),
      compIdx(MAX_NUM_COMPONENT),
+     m_maximumDistortionForEarlyExit(std::numeric_limits<Distortion>::max()),
      iSubShift(0)
   { }

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

@@ -70 +70 @@
   const Int             shift      = wpCur.shift;
   const Int             round      = wpCur.round;
+  const Int        distortionShift = DISTORTION_PRECISION_ADJUSTMENT(pcDtParam->bitDepth-8);
 
   Distortion uiSum = 0;
@@ -80 +81 @@
 
       uiSum += abs( piOrg[n] - pred );
+    }
+    if (pcDtParam->m_maximumDistortionForEarlyExit <  ( uiSum >> distortionShift))
+    {
+      return uiSum >> distortionShift;
     }
     piOrg += iStrideOrg;
@@ -87 +92 @@
   pcDtParam->compIdx = MAX_NUM_COMPONENT;  // reset for DEBUG (assert test)
 
-  return uiSum >> DISTORTION_PRECISION_ADJUSTMENT(pcDtParam->bitDepth-8);
+  return uiSum >> distortionShift;
 }
 

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

@@ -386 +386 @@
   // distortion
   m_cDistParam.bitDepth = pcPatternKey->getBitDepthY();
+  m_cDistParam.m_maximumDistortionForEarlyExit = rcStruct.uiBestSad;
+
   if(m_pcEncCfg->getFastSearch() == SELECTIVE)
   {
@@ -439 +441 @@
           rcStruct.uiBestRound    = 0;
           rcStruct.ucPointNr      = ucPointNr;
+          m_cDistParam.m_maximumDistortionForEarlyExit = uiSad;
         }
       }
@@ -458 +461 @@
       rcStruct.uiBestRound    = 0;
       rcStruct.ucPointNr      = ucPointNr;
+      m_cDistParam.m_maximumDistortionForEarlyExit = uiSad;
     }
   }
@@ -882 +886 @@
       uiDistBest  = uiDist;
       uiDirecBest = i;
+      m_cDistParam.m_maximumDistortionForEarlyExit = uiDist;
     }
   }
@@ -3404 +3409 @@
             }
           }
-#if (ENCODER_FAST_MODE)
+#if ENCODER_FAST_MODE
           }
 #endif
         }
-#if (ENCODER_FAST_MODE)
+#if ENCODER_FAST_MODE
         } // for loop-iRefIdxTemp
 #endif
@@ -4064 +4069 @@
         iBestX    = x;
         iBestY    = y;
+        m_cDistParam.m_maximumDistortionForEarlyExit = uiSad;
       }
     }