Changeset 1413 in 3DVCSoftware for trunk/source/Lib/TLibEncoder/TEncEntropy.cpp


Ignore:
Timestamp:
11 Jul 2018, 15:19:49 (6 years ago)
Author:
tech
Message:

Merged HTM-16.2-dev@1412

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/source/Lib/TLibEncoder/TEncEntropy.cpp

    r1405 r1413  
    44 * granted under this license.
    55 *
    6  * Copyright (c) 2010-2016, ITU/ISO/IEC
     6 * Copyright (c) 2010-2017, ITU/ISO/IEC
    77 * All rights reserved.
    88 *
     
    116116  m_pcEntropyCoderIf->codeSkipFlag( pcCU, uiAbsPartIdx );
    117117}
    118 #if NH_3D_DIS
     118#if NH_3D
    119119Void TEncEntropy::encodeDIS( TComDataCU* pcCU, UInt uiAbsPartIdx, Bool bRD )
    120120{
     
    148148}
    149149
    150 #if NH_3D_IC
     150#if NH_3D
    151151Void TEncEntropy::encodeICFlag( TComDataCU* pcCU, UInt uiAbsPartIdx, Bool bRD )
    152152{
    153 #if NH_3D_ARP
    154153  if ( pcCU->isIntra( uiAbsPartIdx ) || ( pcCU->getSlice()->getViewIndex() == 0 ) || pcCU->getSlice()->getIsDepth() || pcCU->getARPW( uiAbsPartIdx ) > 0 )
    155 #else
    156   if ( pcCU->isIntra( uiAbsPartIdx ) || ( pcCU->getSlice()->getViewIndex() == 0 ) || pcCU->getSlice()->getIsDepth() )
    157 #endif
    158154  {
    159155    return;
     
    186182  }
    187183}
    188 #endif
    189 
    190 #if NH_3D_ARP
     184
    191185Void TEncEntropy::encodeARPW( TComDataCU* pcCU, UInt uiAbsPartIdx )
    192186{
     
    715709#endif
    716710
    717 #if NH_3D_SDC_INTRA
     711#if NH_3D
    718712  if( pcCU->getSDCFlag( uiAbsPartIdx ) && pcCU->isIntra( uiAbsPartIdx ) )
    719713  {
     
    722716    assert( pcCU->getCbf(uiAbsPartIdx, COMPONENT_Y) == 1 );
    723717  }
    724 #endif
    725 #if NH_3D_SDC_INTER
     718
    726719  if( pcCU->getSDCFlag( uiAbsPartIdx ) && !pcCU->isIntra( uiAbsPartIdx ) )
    727720  {
     
    730723    assert( pcCU->getSlice()->getIsDepth() );
    731724  }
    732 #endif
    733 #if NH_3D
    734725  if( pcCU->getSlice()->getIsDepth() )
    735726  {
    736 #if NH_3D_SDC_INTRA || NH_3D_SDC_INTER
    737727    if( pcCU->getSDCFlag( uiAbsPartIdx ) )
    738728    {
     
    740730      return;
    741731    }
    742 #endif
    743 #if NH_3D_DMM
    744732    if( pcCU->isIntra(uiAbsPartIdx) )
    745733  {
     
    754742      }
    755743    }
    756 #endif
    757744  }
    758745#endif
     
    832819}
    833820
    834 Void TEncEntropy::estimateBit (estBitsSbacStruct* pcEstBitsSbac, Int width, Int height, const ChannelType chType)
     821Void TEncEntropy::estimateBit (estBitsSbacStruct* pcEstBitsSbac, Int width, Int height, const ChannelType chType, COEFF_SCAN_TYPE scanType )
    835822{
    836823  const UInt heightAtEntropyCoding = (width != height) ? (height >> 1) : height;
    837824
    838   m_pcEntropyCoderIf->estBit ( pcEstBitsSbac, width, heightAtEntropyCoding, chType );
     825  m_pcEntropyCoderIf->estBit ( pcEstBitsSbac, width, heightAtEntropyCoding, chType, scanType );
    839826}
    840827
     
    851838}
    852839
    853 #if NH_3D_DMM || NH_3D_SDC_INTRA || NH_3D_SDC_INTER
     840#if NH_3D
    854841Void TEncEntropy::encodeDeltaDC  ( TComDataCU* pcCU, UInt absPartIdx )
    855842{
    856843  m_pcEntropyCoderIf->codeDeltaDC( pcCU, absPartIdx );
    857844}
    858 #endif
    859 #if NH_3D_SDC_INTRA || NH_3D_SDC_INTER
     845
    860846Void TEncEntropy::encodeSDCFlag( TComDataCU* pcCU, UInt uiAbsPartIdx, Bool bRD )
    861847{
     
    881867}
    882868
    883 #endif
    884 #if NH_3D_DBBP
     869
    885870Void TEncEntropy::encodeDBBPFlag( TComDataCU* pcCU, UInt uiAbsPartIdx, Bool bRD )
    886871{
Note: See TracChangeset for help on using the changeset viewer.