Changeset 1051 in 3DVCSoftware

Timestamp:

27 Aug 2014, 18:12:33 (10 years ago)

Author:

tech

Message:

Fix of lambda calculation in VSO.

Location:

branches/HTM-12.0-dev1/source/Lib

Files:

• TLibCommon/TypeDef.h (modified) (1 diff)
• TLibEncoder/TEncSearch.cpp (modified) (1 diff)

branches/HTM-12.0-dev1/source/Lib/TLibCommon/TypeDef.h

@@ -306 +306 @@
 #define H_3D_VSO_RM_ASSERTIONS            0   // Output VSO assertions
 #define H_3D_VSO_SYNTH_DIST_OUT           0   // Output of synthesized view distortion instead of depth distortion in encoder output
-#define H_3D_VSO_FIX                      0   // This fix should be enabled after verification 
+#define H_3D_VSO_FIX                      1   // This fix should be enabled after verification 
 #endif
 

branches/HTM-12.0-dev1/source/Lib/TLibEncoder/TEncSearch.cpp

@@ -3083 +3083 @@
         Double dLambda;
         if ( m_pcRdCost->getUseLambdaScaleVSO() )
+        {
           dLambda = m_pcRdCost->getUseRenModel() ? m_pcRdCost->getLambdaVSO() : m_pcRdCost->getSqrtLambdaVSO();
+        }
         else        
+        {
           dLambda = m_pcRdCost->getSqrtLambda();        
-
-        Double cost      = (Double)uiSad + (Double)iModeBits * m_pcRdCost->getSqrtLambda();
+        }
+
+        Double cost      = (Double)uiSad + (Double)iModeBits * dLambda;
 #else
         Double cost      = (Double)uiSad + (Double)iModeBits * m_pcRdCost->getSqrtLambda();