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/TLibCommon/TComCodingStatistics.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 *
     
    8181  STATS__CABAC_BITS__ESCAPE_BITS,
    8282
    83 #if NH_3D_DBBP
     83#if NH_3D
    8484  STATS__CABAC_BITS__DBBP_FLAG,
    85 #endif
    86 #if NH_3D_ARP
    8785  STATS__CABAC_BITS__ARP_FLAG,
    8886#endif
     
    9997  STATS__CABAC_BITS__ALIGNED_ESCAPE_BITS,
    10098
    101 #if NH_3D_IC
     99#if NH_3D
    102100  STATS__CABAC_BITS__3D_IC,
    103 #endif
    104 #if NH_3D_DMM || NH_3D_SDC_INTRA || NH_3D_SDC_INTER
    105101  STATS__CABAC_BITS__DELTADC_SIGN_EP,
    106102  STATS__CABAC_BITS__DELTADC_PREFIX,
    107103  STATS__CABAC_BITS__DELTADC_SUFFIX_EP,
    108 #endif
    109 #if NH_3D_DMM
    110104  STATS__CABAC_BITS__NOTDMM_FLAG,
    111105  STATS__CABAC_BITS__DMMMODE,
    112106  STATS__CABAC_BITS__DMM1_BITS_EP,
    113 #endif
    114 #if NH_3D_SDC_INTRA
    115107  STATS__CABAC_BITS__SDC_INTRA_FLAG,
    116108  STATS__CABAC_BITS__SDC_DELTADC_FLAG,
     
    156148    "CABAC_BITS__SIGN_BIT",
    157149    "CABAC_BITS__ESCAPE_BITS",
    158 #if NH_3D_DBBP
     150#if NH_3D
    159151    "CABAC_BITS__DBBP_FLAG",
    160152#endif
     
    171163    "CABAC_BITS__ALIGNED_ESCAPE_BITS"
    172164
    173 #if NH_3D_IC
     165#if NH_3D
    174166    "CABAC_BITS__3D_IC"
    175 #endif
    176 #if NH_3D_DMM || NH_3D_SDC_INTRA || NH_3D_SDC_INTER
    177167   ,"STATS__CABAC_BITS__DELTADC_SIGN_EP"
    178168   ,"STATS__CABAC_BITS__DELTADC_PREFIX"
    179169   ,"STATS__CABAC_BITS__DELTADC_SUFFIX_EP"
    180 #endif
    181 #if NH_3D_DMM
    182170   ,"STATS__CABAC_BITS__NOTDMM_FLAG"
    183171   ,"STATS__CABAC_BITS__DMMMODE"
    184172   ,"STATS__CABAC_BITS__DMM1_BITS_EP"
    185 #endif
    186 #if NH_3D_SDC_INTRA
    187173    ,"STATS__CABAC_BITS__SDC_INTRA_FLAG"
    188174    ,"STATS__CABAC_BITS__SDC_DELTADC_FLAG"
Note: See TracChangeset for help on using the changeset viewer.