Changeset 483 in 3DVCSoftware for branches/HTM-DEV-0.3-dev0/source/Lib/TLibEncoder

Timestamp:

19 Jun 2013, 17:57:12 (12 years ago)

Author:

tech

Message:

Merged fixes from other dev-branches.

File:

• branches/HTM-DEV-0.3-dev0/source/Lib/TLibEncoder/TEncSearch.cpp (modified) (2 diffs)

branches/HTM-DEV-0.3-dev0/source/Lib/TLibEncoder/TEncSearch.cpp

@@ -2576 +2576 @@
       
 #if H_3D_VSO // M35
+#if H_3D_VSO_FIX // This fix should be enabled after verification 
         Double dLambda;
         if ( m_pcRdCost->getUseLambdaScaleVSO() )
@@ -2583 +2584 @@
 
         Double cost      = (Double)uiSad + (Double)iModeBits * m_pcRdCost->getSqrtLambda();
+#else
+        Double cost      = (Double)uiSad + (Double)iModeBits * m_pcRdCost->getSqrtLambda();
+#endif
 #else
         Double cost      = (Double)uiSad + (Double)iModeBits * m_pcRdCost->getSqrtLambda();