Ignore:
Timestamp:
29 Aug 2013, 15:10:30 (11 years ago)
Author:
tech
Message:

Merged dev3: DEV-2.0-DEV3-KWU@589

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/HTM-DEV-2.0-dev0/source/Lib/TLibCommon/ContextTables.h

    r598 r601  
    112112#if H_3D_DIM_DMM
    113113#define NUM_DMM1_DATA_CTX             1       ///< number of context models for DMM1 data
     114#if !SEC_DMM2_E0146
    114115#define NUM_DMM2_DATA_CTX             1       ///< number of context models for DMM2 data
     116#endif
    115117#define NUM_DMM3_DATA_CTX             1       ///< number of context models for DMM3 data
    116118#endif
     
    388390#endif
    389391#if H_3D_DIM
     392#if ZJU_DEPTH_INTRA_MODE_E0204
     393static const UChar
     394INIT_DEPTH_INTRA_MODE[3][NUM_DEPTH_INTRA_MODE_CTX] =
     395{
     396    {0,  0,  64, 168, 168, 124, CNU, 0},
     397    {0, 64,   0, 183, CNU, 108,   0, 0},
     398    {64, 0, CNU, CNU, 168, 109,   0, 0}
     399};
     400#else
    390401static const UChar
    391402INIT_DEPTH_INTRA_MODE[3][NUM_DEPTH_INTRA_MODE_CTX] =
     
    395406  {64, 0, CNU,   0, CNU,   0,   0, 0}
    396407};
     408#endif
    397409static const UChar
    398410INIT_DDC_FLAG[3][NUM_DDC_FLAG_CTX] =
     
    417429  { CNU },
    418430};
     431#if !SEC_DMM2_E0146
    419432static const UChar
    420433INIT_DMM2_DATA[3][NUM_DMM2_DATA_CTX] =
     
    424437  { CNU },
    425438};
     439#endif
    426440static const UChar
    427441INIT_DMM3_DATA[3][NUM_DMM3_DATA_CTX] =
Note: See TracChangeset for help on using the changeset viewer.