Changeset 1233 in 3DVCSoftware for branches/HTM-14.1-update-dev3-ETRI/source/Lib/TLibCommon/TypeDef.h

Timestamp:

26 May 2015, 07:13:47 (9 years ago)

Author:

etri-htm

Message:

Reactive_MLC (the MACRO is "NH_3D_MLC")

File:

• branches/HTM-14.1-update-dev3-ETRI/source/Lib/TLibCommon/TypeDef.h (modified) (3 diffs)

branches/HTM-14.1-update-dev3-ETRI/source/Lib/TLibCommon/TypeDef.h

@@ -71 +71 @@
 #define NH_3D_NBDV                        1
 #define NH_3D_NBDV_REF                    1
+#define NH_3D_MLC                         1
 #endif
 
@@ -712 +713 @@
   MD_ABOVE_LEFT         ///< MVP of above left block
 };
-#if H_3D
+#if NH_3D_MLC
 enum DefaultMergCandOrder
 {
@@ -725 +726 @@
   MRG_A0,               ///< Left bottom
   MRG_B2,               ///< Above left
-  MRG_IVSHIFT,          ///< Shifted IVMC of Shifted IVDC. (These are mutually exclusive)
+  MRG_IVSHIFT,          ///< Shifted IVMC or Shifted IVDC. (These are mutually exclusive)
   MRG_COL               ///< Temporal co-located
 };