Changeset 283 in 3DVCSoftware for branches

Timestamp:

17 Feb 2013, 00:19:54 (12 years ago)

Author:

tech

Message:

Enabled MERL_VSP_C0152
Disabled MTK_DEPTH_MERGE_TEXTURE_CANDIDATE_C0137

File:

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

branches/HTM-5.1-dev0/source/Lib/TLibCommon/TypeDef.h

@@ -54 +54 @@
 
 // C TRACK 3
-#define MERL_VSP_C0152                                0 // JCT3V-C0152: 1: enable VSP-related tools; 0: disable VSP-related tools
+#define MERL_VSP_C0152                                1 // JCT3V-C0152: 1: enable VSP-related tools; 0: disable VSP-related tools
 #define MTK_SAIT_TEMPORAL_FIRST_ORDER_C0141_C0097     1   // JCT3V-C0141/C0097
 #define MTK_SIMPLIFY_DVTC_C0135                       1   // JCT3V-C0135
@@ -124 +124 @@
 #define QC_SIMPLE_NBDV_B0047              1   // JCT3V-B0047
 ///// ***** MOTION PARAMETER INHERITANCE  *********
-#define MTK_DEPTH_MERGE_TEXTURE_CANDIDATE_C0137   1   // JCT3V-C0137
+#define MTK_DEPTH_MERGE_TEXTURE_CANDIDATE_C0137   0   // JCT3V-C0137
 #define HHI_MPI                           0   // motion parameter inheritance from texture picture for depth map coding
 #if HHI_MPI