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

    r531 r601  
    5050enum DIM_IDX
    5151{
     52#if SEC_DMM2_E0146
     53  DMM1_IDX = 0,
     54  DMM3_IDX = 1,
     55  DMM4_IDX = 2,
     56  RBC_IDX  = 3
     57#else
    5258  DMM1_IDX = 0,
    5359  DMM2_IDX = 3,
     
    5561  DMM4_IDX = 2,
    5662  RBC_IDX  = 4
     63#endif
    5764};
     65#if SEC_DMM2_E0146
     66#define DMM_NUM_TYPE   3
     67#else
    5868#define DMM_NUM_TYPE   4
     69#endif
    5970#define RBC_NUM_TYPE   1
    6071#define DIM_NUM_TYPE   (DMM_NUM_TYPE+RBC_NUM_TYPE)
     
    7586#define DMM_NO_WEDGEINDEX       MAX_UINT
    7687#define DMM_NUM_WEDGE_REFINES   8
     88#if !SEC_DMM2_E0146
    7789#define DMM2_DELTAEND_MAX       4
     90#endif
    7891#define DMM3_SIMPLIFY_TR        1
    7992
Note: See TracChangeset for help on using the changeset viewer.