Changeset 1413 in 3DVCSoftware for trunk/source/Lib/TLibEncoder/TEncSbac.h


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/TEncSbac.h

    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 *
     
    8080  Void  load                   ( const TEncSbac* pSrc  );
    8181  Void  loadIntraDirMode       ( const TEncSbac* pScr, const ChannelType chType  );
    82 #if NH_3D_DMM
     82#if NH_3D
    8383  Void  loadIntraDepthDmm      ( const TEncSbac* pSrc );
    8484#endif
     
    115115  Void  xWriteEpExGolomb     ( UInt uiSymbol, UInt uiCount );
    116116  Void  xWriteCoefRemainExGolomb ( UInt symbol, UInt &rParam, const Bool useLimitedPrefixLength, const Int maxLog2TrDynamicRange );
    117 #if NH_3D_DMM || NH_3D_SDC_INTRA || NH_3D_SDC_INTER
     117#if NH_3D
    118118  Void  xWriteExGolombLevelDdc( UInt uiSymbol );
    119119  Void  xCodeDeltaDC         ( Pel valDeltaDC, UInt uiNumSeg );
    120 #endif
    121 #if NH_3D_DMM
    122120  Void  xCodeIntraDepthMode  ( TComDataCU* pcCU, UInt absPartIdx );
    123121  Void  xCodeDmmData         ( TComDataCU* pcCU, UInt absPartIdx );
     
    138136  Void codeCUTransquantBypassFlag( TComDataCU* pcCU, UInt uiAbsPartIdx );
    139137  Void codeSkipFlag      ( TComDataCU* pcCU, UInt uiAbsPartIdx );
    140 #if NH_3D_DIS
     138#if NH_3D
    141139  Void codeDIS           ( TComDataCU* pcCU, UInt uiAbsPartIdx );
    142140#endif
    143141  Void codeMergeFlag     ( TComDataCU* pcCU, UInt uiAbsPartIdx );
    144142  Void codeMergeIndex    ( TComDataCU* pcCU, UInt uiAbsPartIdx );
    145 #if NH_3D_ARP
     143#if NH_3D
    146144  Void codeARPW          ( TComDataCU* pcCU, UInt uiAbsPartIdx );
    147 #endif
    148 #if NH_3D_IC
    149145  Void codeICFlag        ( TComDataCU* pcCU, UInt uiAbsPartIdx );
    150 #endif
    151 #if NH_3D_DMM || NH_3D_SDC_INTRA || NH_3D_SDC_INTER
    152146  Void  codeDeltaDC      ( TComDataCU* pcCU, UInt absPartIdx );
    153 #endif
    154 #if NH_3D_SDC_INTRA || NH_3D_SDC_INTER
    155147  Void codeSDCFlag       ( TComDataCU* pcCU, UInt uiAbsPartIdx );
    156 #endif
    157 #if NH_3D_DBBP
    158148  Void codeDBBPFlag      ( TComDataCU* pcCU, UInt uiAbsPartIdx );
    159149#endif
     
    188178  // -------------------------------------------------------------------------------------------------------------------
    189179
    190   Void estBit               (estBitsSbacStruct* pcEstBitsSbac, Int width, Int height, ChannelType chType);
     180  Void estBit               (estBitsSbacStruct* pcEstBitsSbac, Int width, Int height, ChannelType chType, COEFF_SCAN_TYPE scanType);
    191181  Void estCBFBit                     ( estBitsSbacStruct* pcEstBitsSbac );
    192182  Void estSignificantCoeffGroupMapBit( estBitsSbacStruct* pcEstBitsSbac, ChannelType chType );
    193183  Void estSignificantMapBit          ( estBitsSbacStruct* pcEstBitsSbac, Int width, Int height, ChannelType chType );
    194   Void estLastSignificantPositionBit ( estBitsSbacStruct* pcEstBitsSbac, Int width, Int height, ChannelType chType );
     184  Void estLastSignificantPositionBit ( estBitsSbacStruct* pcEstBitsSbac, Int width, Int height, ChannelType chType, COEFF_SCAN_TYPE scanType );
    195185  Void estSignificantCoefficientsBit ( estBitsSbacStruct* pcEstBitsSbac, ChannelType chType );
    196186
     
    204194  ContextModel3DBuffer m_cCUSplitFlagSCModel;
    205195  ContextModel3DBuffer m_cCUSkipFlagSCModel;
    206 #if NH_3D_DIS
     196#if NH_3D
    207197  ContextModel3DBuffer m_cCUDISFlagSCModel;
    208198  ContextModel3DBuffer m_cCUDISTypeSCModel;
     
    210200  ContextModel3DBuffer m_cCUMergeFlagExtSCModel;
    211201  ContextModel3DBuffer m_cCUMergeIdxExtSCModel;
    212 #if NH_3D_ARP
     202#if NH_3D
    213203  ContextModel3DBuffer m_cCUPUARPWSCModel;
    214 #endif
    215 #if NH_3D_IC
    216204  ContextModel3DBuffer m_cCUICFlagSCModel;
    217205#endif
     
    248236  ContextModel3DBuffer m_ChromaQpAdjIdcSCModel;
    249237
    250 #if NH_3D_DMM
     238#if NH_3D
    251239  ContextModel3DBuffer m_cNotDmmFlagSCModel;
    252240  ContextModel3DBuffer m_cDmmModeSCModel;
    253 #endif
    254 #if NH_3D_DMM || NH_3D_SDC_INTRA || NH_3D_SDC_INTER
    255241  ContextModel3DBuffer m_cDdcDataSCModel;
    256242  ContextModel3DBuffer m_cSDCFlagSCModel;
    257 #endif
    258 #if NH_3D_SDC_INTRA 
    259243  ContextModel3DBuffer m_cSDCResidualFlagSCModel;
    260244  ContextModel3DBuffer m_cSDCResidualSCModel;
    261245  ContextModel3DBuffer m_cDdcFlagSCModel;
    262 #endif
    263 #if NH_3D_DBBP
    264246  ContextModel3DBuffer m_cDBBPFlagSCModel;
    265247#endif
Note: See TracChangeset for help on using the changeset viewer.