Changeset 1342 in SHVCSoftware for branches/SHM-dev

Timestamp:

22 Jul 2015, 02:56:44 (9 years ago)

Author:

seregin

Message:

port rev 4420

Location:

branches/SHM-dev/source/Lib

Files:

• TLibCommon/TypeDef.h (modified) (1 diff)
• TLibEncoder/TEncCu.cpp (modified) (4 diffs)

branches/SHM-dev/source/Lib/TLibCommon/TypeDef.h

@@ -163 +163 @@
 
 #define DECODER_CHECK_SUBSTREAM_AND_SLICE_TRAILING_BYTES  1
-#define RDO_WITHOUT_DQP_BITS                              0 ///< Disable counting dQP bits in RDO-based mode decision
 #define SAO_ENCODE_ALLOW_USE_PREDEBLOCK                   1
 #define T0196_SELECTIVE_RDOQ                              1 ///< selective RDOQ

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

@@ -928 +928 @@
         if ( hasResidual )
         {
-#if !RDO_WITHOUT_DQP_BITS
           m_pcEntropyCoder->resetBits();
           m_pcEntropyCoder->encodeQP( rpcTempCU, uiTargetPartIdx, false );
@@ -934 +933 @@
           rpcTempCU->getTotalBins() += ((TEncBinCABAC *)((TEncSbac*)m_pcEntropyCoder->m_pcEntropyCoderIf)->getEncBinIf())->getBinsCoded();
           rpcTempCU->getTotalCost()  = m_pcRdCost->calcRdCost( rpcTempCU->getTotalBits(), rpcTempCU->getTotalDistortion() );
-#endif
 
           Bool foundNonZeroCbf = false;
@@ -1657 +1655 @@
     if ( pcCU->getQtRootCbf( 0) )
     {
-#if !RDO_WITHOUT_DQP_BITS
       m_pcEntropyCoder->resetBits();
       m_pcEntropyCoder->encodeQP( pcCU, 0, false );
@@ -1663 +1660 @@
       pcCU->getTotalBins() += ((TEncBinCABAC *)((TEncSbac*)m_pcEntropyCoder->m_pcEntropyCoderIf)->getEncBinIf())->getBinsCoded();
       pcCU->getTotalCost() = m_pcRdCost->calcRdCost( pcCU->getTotalBits(), pcCU->getTotalDistortion() );
-#endif
     }
     else