Changeset 601 in 3DVCSoftware for branches/HTM-DEV-2.0-dev0/source/Lib/TLibCommon/TComWedgelet.h

Timestamp:

29 Aug 2013, 15:10:30 (12 years ago)

Author:

tech

Message:

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

File:

• branches/HTM-DEV-2.0-dev0/source/Lib/TLibCommon/TComWedgelet.h (modified) (3 diffs)

branches/HTM-DEV-2.0-dev0/source/Lib/TLibCommon/TComWedgelet.h

@@ -50 +50 @@
 enum DIM_IDX
 {
+#if SEC_DMM2_E0146
+  DMM1_IDX = 0,
+  DMM3_IDX = 1,
+  DMM4_IDX = 2,
+  RBC_IDX  = 3
+#else
   DMM1_IDX = 0,
   DMM2_IDX = 3,
@@ -55 +61 @@
   DMM4_IDX = 2,
   RBC_IDX  = 4
+#endif
 };
+#if SEC_DMM2_E0146
+#define DMM_NUM_TYPE   3
+#else
 #define DMM_NUM_TYPE   4
+#endif
 #define RBC_NUM_TYPE   1
 #define DIM_NUM_TYPE   (DMM_NUM_TYPE+RBC_NUM_TYPE)
@@ -75 +86 @@
 #define DMM_NO_WEDGEINDEX       MAX_UINT
 #define DMM_NUM_WEDGE_REFINES   8
+#if !SEC_DMM2_E0146
 #define DMM2_DELTAEND_MAX       4
+#endif
 #define DMM3_SIMPLIFY_TR        1