Changeset 1412 in 3DVCSoftware for branches/HTM-16.2-dev/source/Lib/TLibCommon/TComRdCostWeightPrediction.cpp

Timestamp:

12 Apr 2018, 11:12:21 (7 years ago)

Author:

tech

Message:

• Update HM-16.18
• Cleanups
• Encoder Extension

-- Representation formats
-- Parameter set sharing
-- GOP configuration

File:

• branches/HTM-16.2-dev/source/Lib/TLibCommon/TComRdCostWeightPrediction.cpp (modified) (5 diffs)

branches/HTM-16.2-dev/source/Lib/TLibCommon/TComRdCostWeightPrediction.cpp

@@ -4 +4 @@
  * granted under this license.
  *
- * Copyright (c) 2010-2016, ITU/ISO/IEC
+ * Copyright (c) 2010-2017, ITU/ISO/IEC
  * All rights reserved.
  *
@@ -74 +74 @@
   Distortion uiSum = 0;
 
-#if !U0040_MODIFIED_WEIGHTEDPREDICTION_WITH_BIPRED_AND_CLIPPING
-  for(Int iRows = pcDtParam->iRows; iRows != 0; iRows-- )
-  {
-    for (Int n = 0; n < iCols; n++ )
-    {
-      const Pel pred = ( (w0*piCur[n] + round) >> shift ) + offset ;
-
-      uiSum += abs( piOrg[n] - pred );
-    }
-    if (pcDtParam->m_maximumDistortionForEarlyExit <  ( uiSum >> distortionShift))
-    {
-      return uiSum >> distortionShift;
-    }
-    piOrg += iStrideOrg;
-    piCur += iStrideCur;
-  }
-
-  pcDtParam->compIdx = MAX_NUM_COMPONENT;  // reset for DEBUG (assert test)
-#else
   // Default weight
   if (w0 == 1 << shift)
@@ -222 +203 @@
   }
   //pcDtParam->compIdx = MAX_NUM_COMPONENT;  // reset for DEBUG (assert test)
-#endif
 
   return uiSum >> distortionShift;
@@ -256 +236 @@
   Distortion sum = 0;
 
-#if !U0040_MODIFIED_WEIGHTEDPREDICTION_WITH_BIPRED_AND_CLIPPING
-  for(Int iRows = pcDtParam->iRows ; iRows != 0; iRows-- )
-  {
-    for (Int n = 0; n < iCols; n++ )
-    {
-      const Pel pred     = ( (w0*piCur[n] + round) >> shift ) + offset ;
-      const Pel residual = piOrg[n] - pred;
-      sum += ( Distortion(residual) * Distortion(residual) ) >> distortionShift;
-    }
-    piOrg += iStrideOrg;
-    piCur += iStrideCur;
-  }
-
-  pcDtParam->compIdx = MAX_NUM_COMPONENT; // reset for DEBUG (assert test)
-#else
   if (pcDtParam->bIsBiPred)
   {
@@ -303 +268 @@
 
   //pcDtParam->compIdx = MAX_NUM_COMPONENT; // reset for DEBUG (assert test)
-#endif
 
   return sum;