Changeset 1413 in 3DVCSoftware for trunk/source/Lib/TLibEncoder/TEncCavlc.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/TEncCavlc.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 *
     
    130130  Void codeCUTransquantBypassFlag( TComDataCU* pcCU, UInt uiAbsPartIdx );
    131131  Void codeSkipFlag      ( TComDataCU* pcCU, UInt uiAbsPartIdx );
    132 #if NH_3D_DIS
     132#if NH_3D
    133133  Void codeDIS           ( TComDataCU* pcCU, UInt uiAbsPartIdx );
    134134#endif
    135135  Void codeMergeFlag     ( TComDataCU* pcCU, UInt uiAbsPartIdx );
    136136  Void codeMergeIndex    ( TComDataCU* pcCU, UInt uiAbsPartIdx );
    137 #if NH_3D_DMM || NH_3D_SDC_INTRA || NH_3D_SDC_INTER
    138   Void  codeDeltaDC      ( TComDataCU* /*pcCU*/, UInt /*absPartIdx*/ ) { assert(0); };
    139 #endif
    140 #if NH_3D_ARP
     137#if NH_3D
     138  Void codeDeltaDC      ( TComDataCU* /*pcCU*/, UInt /*absPartIdx*/ ) { assert(0); };
    141139  Void codeARPW          ( TComDataCU* pcCU, UInt uiAbsPartIdx );
    142 #endif
    143 #if NH_3D_IC
    144140  Void codeICFlag        ( TComDataCU* pcCU, UInt uiAbsPartIdx );
    145 #endif
    146 
    147 #if NH_3D_SDC_INTRA || NH_3D_SDC_INTER
    148141  Void codeSDCFlag       ( TComDataCU* pcCU, UInt uiAbsPartIdx );
    149 #endif
    150 #if NH_3D_DBBP
    151142  Void codeDBBPFlag       ( TComDataCU* pcCU, UInt uiAbsPartIdx );
    152143#endif
     
    179170  Void codeTransformSkipFlags ( TComTU &rTu, ComponentID component );
    180171
    181   Void estBit            ( estBitsSbacStruct* pcEstBitsSbac, Int width, Int height, ChannelType chType );
     172  Void estBit            ( estBitsSbacStruct* pcEstBitsSbac, Int width, Int height, ChannelType chType, COEFF_SCAN_TYPE scanType );
    182173
    183174  Void xCodePredWeightTable          ( TComSlice* pcSlice );
Note: See TracChangeset for help on using the changeset viewer.