Changeset 1396 in 3DVCSoftware for trunk/source/Lib/TLibEncoder/TEncCu.cpp

Timestamp:

11 Mar 2016, 16:54:51 (9 years ago)

Author:

tech

Message:

Merged HTM-16.0-dev1@1395.

File:

• trunk/source/Lib/TLibEncoder/TEncCu.cpp (modified) (4 diffs)

trunk/source/Lib/TLibEncoder/TEncCu.cpp

@@ -1199 +1199 @@
       rpcBestCU->getTotalBins() += ((TEncBinCABAC *)((TEncSbac*)m_pcEntropyCoder->m_pcEntropyCoderIf)->getEncBinIf())->getBinsCoded();
 #if NH_3D_VSO // M8
-    if ( m_pcRdCost->getUseVSO() )    
+    if ( m_pcRdCost->getUseLambdaScaleVSO() )    
     {
       rpcBestCU->getTotalCost()  = m_pcRdCost->calcRdCostVSO( rpcBestCU->getTotalBits(), rpcBestCU->getTotalDistortion() );    
@@ -1340 +1340 @@
       }
 #if NH_3D_VSO // M10
-      if ( m_pcRdCost->getUseVSO() )
+      if ( m_pcRdCost->getUseLambdaScaleVSO() )
       {
         rpcTempCU->getTotalCost()  = m_pcRdCost->calcRdCostVSO( rpcTempCU->getTotalBits(), rpcTempCU->getTotalDistortion() );
@@ -2974 +2974 @@
   rpcTempCU->getTotalBins() = ((TEncBinCABAC *)((TEncSbac*)m_pcEntropyCoder->m_pcEntropyCoderIf)->getEncBinIf())->getBinsCoded();
 #if NH_3D_VSO // M44
-  if ( m_pcRdCost->getUseVSO() )
+  if ( m_pcRdCost->getUseLambdaScaleVSO() )
   {
     rpcTempCU->getTotalCost() = m_pcRdCost->calcRdCostVSO( rpcTempCU->getTotalBits(), rpcTempCU->getTotalDistortion() );
@@ -3047 +3047 @@
       pcCU->getTotalBins() += ((TEncBinCABAC *)((TEncSbac*)m_pcEntropyCoder->m_pcEntropyCoderIf)->getEncBinIf())->getBinsCoded();
 #if NH_3D_VSO // M45
-      if ( m_pcRdCost->getUseVSO() )      
+      if ( m_pcRdCost->getUseLambdaScaleVSO() )      
       {
         pcCU->getTotalCost() = m_pcRdCost->calcRdCostVSO( pcCU->getTotalBits(), pcCU->getTotalDistortion() );