Changeset 1413 in 3DVCSoftware for trunk/source/Lib/TLibCommon/ContextTables.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/TLibCommon/ContextTables.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 *
     
    5151#define NUM_SPLIT_FLAG_CTX            3       ///< number of context models for split flag
    5252#define NUM_SKIP_FLAG_CTX             3       ///< number of context models for skip flag
    53 #if NH_3D_DIS
     53#if NH_3D
    5454#define NUM_DIS_FLAG_CTX              1
    5555#define NUM_DIS_TYPE_CTX              1       
     
    162162#define NUM_CU_TRANSQUANT_BYPASS_FLAG_CTX  1
    163163
    164 #if NH_3D_ARP
     164#if NH_3D
    165165#define NUM_ARPW_CTX                  3       ///< number of context models for weighting factor index used by advanced residual prediction
    166 #endif
    167 
    168 #if NH_3D_IC
    169166#define NUM_IC_FLAG_CTX               1       ///< number of context models for illumination compensation flag
    170167#endif
     168
    171169#define NUM_CROSS_COMPONENT_PREDICTION_CTX 10
    172170
    173171#define CNU                          154      ///< dummy initialization value for unused context models 'Context model Not Used'
    174172
    175 #if NH_3D_DMM
     173#if NH_3D
    176174#define NUM_NOTDMM_FLAG_CTX           1       ///< number of context models for not-DMM flag
    177175#define NUM_DMM_MODE_CTX              1       ///< number of context models for DMM modes
    178 #endif
    179 #if NH_3D_DMM || NH_3D_SDC_INTRA
    180176#define NUM_DDC_DATA_CTX              1       ///< number of context models for deltaDC data (DMM or SDC)
    181 #endif
    182 #if NH_3D_SDC_INTRA
    183177#define SDC_NUM_RESIDUAL_FLAG_CTX     1
    184178#define SDC_NUM_RESIDUAL_CTX          1
    185179#define NUM_SDC_FLAG_CTX              1      ///< number of context
    186180#define NUM_DDC_FLAG_CTX              2       ///< number of context models for deltaDC flag (SDC only)
    187 #endif
    188 #if NH_3D_DBBP
    189 #define DBBP_NUM_FLAG_CTX                 1
     181#define DBBP_NUM_FLAG_CTX             1
    190182#endif
    191183// ====================================================================================================================
     
    218210  { CNU,  CNU,  CNU, },
    219211};
    220 #if NH_3D_DIS
     212#if NH_3D
    221213static const UChar
    222214INIT_DIS_FLAG[3][NUM_DIS_FLAG_CTX] = 
     
    540532//! \}
    541533
    542 #if NH_3D_ARP
     534#if NH_3D
    543535static const UChar
    544536INIT_ARPW[3][NUM_ARPW_CTX] =
     
    549541};
    550542
    551 #endif
    552 #if NH_3D_IC
    553543static const UChar
    554544INIT_IC_FLAG[3][NUM_IC_FLAG_CTX] = 
     
    559549};
    560550
    561 #endif
    562 
    563 #if NH_3D_DMM
    564551static const UChar
    565552INIT_NOTDMM_FLAG[3][NUM_NOTDMM_FLAG_CTX] =
     
    576563  { CNU }
    577564};
    578 #endif
    579 #if NH_3D_DMM || NH_3D_SDC_INTRA
     565
    580566static const UChar
    581567INIT_DDC_DATA[3][NUM_DDC_DATA_CTX] =
     
    585571  { CNU },
    586572};
    587 #endif
    588 #if NH_3D_SDC_INTRA
     573
    589574static const UChar
    590575INIT_SDC_RESIDUAL_FLAG[3][SDC_NUM_RESIDUAL_FLAG_CTX] =
     
    615600  {64, CNU}
    616601};
     602static const UChar INIT_DBBP_FLAG[3][DBBP_NUM_FLAG_CTX] =
     603{
     604  { CNU },
     605  { CNU },
     606  { CNU },
     607};
    617608#endif
    618 #if NH_3D_DBBP
    619 static const UChar INIT_DBBP_FLAG[3][DBBP_NUM_FLAG_CTX] =
    620 {
    621   { CNU },
    622   { CNU },
    623   { CNU },
    624 };
     609
    625610#endif
    626 
    627 #endif
Note: See TracChangeset for help on using the changeset viewer.