Changeset 842 in 3DVCSoftware for branches/HTM-10.0rc1-dev0

Timestamp:

8 Feb 2014, 18:36:25 (11 years ago)

Author:

tech

Message:

Further fixes.

Location:

branches/HTM-10.0rc1-dev0/source/Lib/TLibEncoder

Files:

• TEncCu.cpp (modified) (1 diff)
• TEncSlice.cpp (modified) (1 diff)

branches/HTM-10.0rc1-dev0/source/Lib/TLibEncoder/TEncCu.cpp

@@ -1083 +1083 @@
     rpcBestCU->getTotalBits() += m_pcEntropyCoder->getNumberOfWrittenBits(); // split bits
       rpcBestCU->getTotalBins() += ((TEncBinCABAC *)((TEncSbac*)m_pcEntropyCoder->m_pcEntropyCoderIf)->getEncBinIf())->getBinsCoded();
+    #if H_3D_VSO // M8
+    if ( m_pcRdCost->getUseVSO() )    
+      rpcBestCU->getTotalCost()  = m_pcRdCost->calcRdCostVSO( rpcBestCU->getTotalBits(), rpcBestCU->getTotalDistortion() );    
+    else
+#endif
     rpcBestCU->getTotalCost()  = m_pcRdCost->calcRdCost( rpcBestCU->getTotalBits(), rpcBestCU->getTotalDistortion() );
 

branches/HTM-10.0rc1-dev0/source/Lib/TLibEncoder/TEncSlice.cpp

@@ -1458 +1458 @@
       }
     }
+#if H_3D_QTLPC
+    rpcPic->setReduceBitsFlag(false);
+#endif
   if( depSliceSegmentsEnabled )
   {