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

Timestamp:

9 Sep 2015, 18:16:24 (10 years ago)

Author:

seregin

Message:

port rev 4598

Location:

branches/SHM-dev/source/Lib/TLibCommon

Files:

• TComRdCost.cpp (modified) (1 diff)
• TComRdCost.h (modified) (3 diffs)

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

@@ -165 +165 @@
   m_costMode                   = COST_STANDARD_LOSSY;
 
-  m_dCost                      = 0;
+  m_motionLambda               = 0;
   m_iCostScale                 = 0;
 }

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

@@ -125 +125 @@
   // for motion cost
   TComMv                  m_mvPredictor;
-  Double                  m_dCost;
+  Double                  m_motionLambda;
   Int                     m_iCostScale;
 
@@ -157 +157 @@
   // for motion cost
   static UInt    xGetExpGolombNumberOfBits( Int iVal );
-  Void    getMotionCost( Bool bSad, Int iAdd, Bool bIsTransquantBypass ) { m_dCost = (bSad ? m_dLambdaMotionSAD[(bIsTransquantBypass && m_costMode==COST_MIXED_LOSSLESS_LOSSY_CODING) ?1:0] + iAdd : m_dLambdaMotionSSE[(bIsTransquantBypass && m_costMode==COST_MIXED_LOSSLESS_LOSSY_CODING)?1:0] + iAdd); }
+  Void    selectMotionLambda( Bool bSad, Int iAdd, Bool bIsTransquantBypass ) { m_motionLambda = (bSad ? m_dLambdaMotionSAD[(bIsTransquantBypass && m_costMode==COST_MIXED_LOSSLESS_LOSSY_CODING) ?1:0] + iAdd : m_dLambdaMotionSSE[(bIsTransquantBypass && m_costMode==COST_MIXED_LOSSLESS_LOSSY_CODING)?1:0] + iAdd); }
   Void    setPredictor( TComMv& rcMv )
   {
@@ -163 +163 @@
   }
   Void    setCostScale( Int iCostScale )    { m_iCostScale = iCostScale; }
-  __inline Distortion getCost( Int x, Int y )
+  Distortion getCost( UInt b )                 { return Distortion(( m_motionLambda * b ) / 65536.0); }
+  Distortion getCostOfVectorWithPredictor( const Int x, const Int y )
   {
-    return Distortion((m_dCost * getBits(x, y)) / 65536.0);
+    return Distortion((m_motionLambda * getBitsOfVectorWithPredictor(x, y)) / 65536.0);
   }
-  Distortion getCost( UInt b )                 { return Distortion(( m_dCost * b ) / 65536.0); }
-  UInt    getBits( Int x, Int y )
+  UInt getBitsOfVectorWithPredictor( const Int x, const Int y )
   {
     return xGetExpGolombNumberOfBits((x << m_iCostScale) - m_mvPredictor.getHor())