Changeset 712 in 3DVCSoftware for branches/HTM-8.2-dev0/source/Lib/TLibCommon/TComWedgelet.h

Timestamp:

21 Nov 2013, 13:28:24 (11 years ago)

Author:

tech

Message:

Merged DEV3 ( branch HTM-8.2-dev3-Samsung@699 )

File:

• branches/HTM-8.2-dev0/source/Lib/TLibCommon/TComWedgelet.h (modified) (2 diffs)

branches/HTM-8.2-dev0/source/Lib/TLibCommon/TComWedgelet.h

@@ -50 +50 @@
 enum DIM_IDX
 {
+#if SEC_DMM3_RBC_F0147
+  DMM1_IDX = 0,
+  DMM4_IDX = 1,
+#else
   DMM1_IDX = 0,
   DMM3_IDX = 1,
   DMM4_IDX = 2,
   RBC_IDX  = 3
+#endif
 };
 
+#if SEC_DMM3_RBC_F0147
+#define DMM_NUM_TYPE   2
+#define DIM_NUM_TYPE   (DMM_NUM_TYPE)
+#else
 #define DMM_NUM_TYPE   3
 #define RBC_NUM_TYPE   1
 #define DIM_NUM_TYPE   (DMM_NUM_TYPE+RBC_NUM_TYPE)
+#endif
 #define DIM_NO_IDX     MAX_UINT
 
@@ -75 +85 @@
 #define DMM_NO_WEDGEINDEX       MAX_UINT
 #define DMM_NUM_WEDGE_REFINES   8
+#if !SEC_DMM3_RBC_F0147
 #define DMM3_SIMPLIFY_TR        1
+#endif
 
 enum WedgeResolution