Changeset 1314 in SHVCSoftware

Timestamp:

21 Jul 2015, 01:36:13 (9 years ago)

Author:

seregin

Message:

port rev 4388

File:

• branches/SHM-dev/source/Lib/TLibEncoder/TEncCu.cpp (modified) (4 diffs)

branches/SHM-dev/source/Lib/TLibEncoder/TEncCu.cpp

@@ -774 +774 @@
     }
 
+    m_pcRDGoOnSbacCoder->load(m_pppcRDSbacCoder[uiDepth][CI_NEXT_BEST]);
     m_pcEntropyCoder->resetBits();
     m_pcEntropyCoder->encodeSplitFlag( rpcBestCU, 0, uiDepth, true );
@@ -779 +780 @@
     rpcBestCU->getTotalBins() += ((TEncBinCABAC *)((TEncSbac*)m_pcEntropyCoder->m_pcEntropyCoderIf)->getEncBinIf())->getBinsCoded();
     rpcBestCU->getTotalCost()  = m_pcRdCost->calcRdCost( rpcBestCU->getTotalBits(), rpcBestCU->getTotalDistortion() );
+    m_pcRDGoOnSbacCoder->store(m_pppcRDSbacCoder[uiDepth][CI_NEXT_BEST]);
 
     // Early CU determination
@@ -898 +900 @@
       }
 
+      m_pcRDGoOnSbacCoder->load(m_pppcRDSbacCoder[uhNextDepth][CI_NEXT_BEST]);
       if( !bBoundary )
       {
@@ -943 +946 @@
       }
 
-      m_pppcRDSbacCoder[uhNextDepth][CI_NEXT_BEST]->store(m_pppcRDSbacCoder[uiDepth][CI_TEMP_BEST]);
+      m_pcRDGoOnSbacCoder->store(m_pppcRDSbacCoder[uiDepth][CI_TEMP_BEST]);
 
       // TODO: this does not account for the slice bytes already written. See other instances of FIXED_NUMBER_OF_BYTES