Changeset 213 in 3DVCSoftware for branches/HTM-4.0.1-VSP-dev0/source/Lib/TLibCommon/CommonDef.h

Timestamp:

31 Dec 2012, 18:33:14 (12 years ago)

Author:

mitsubishi-htm

Message:

A final release, as planned

• Migrate to HTM 5.1
• For VC project files, only VC9 file is updated
• To be used as an additional anchor for CE1.h for 3rd JCTVC meeting at Geneva

File:

• branches/HTM-4.0.1-VSP-dev0/source/Lib/TLibCommon/CommonDef.h (modified) (5 diffs)

branches/HTM-4.0.1-VSP-dev0/source/Lib/TLibCommon/CommonDef.h

@@ -58 +58 @@
 
 #define HM_VERSION        "6.1"
-#define NV_VERSION        "4.1"                  ///< Current software version
+#define NV_VERSION        "5.1"                  ///< Current software version
 
 // ====================================================================================================================
@@ -144 +144 @@
 #define PDM_NO_INTER_UPDATE               1         // no update for inter (but not inter-view) predicted blocks
 #define PDM_MERGE_POS                     0         // position of pdm in merge list (0..4)
-#if SAIT_IMPROV_MOTION_PRED_M24829&!QC_MULTI_DIS_CAN
+
+#if QC_MRG_CANS_B0048
+#if OL_DISMV_POS_B0069
+#define DMV_MERGE_POS                     4
+#else
+#define DMV_MERGE_POS                     1
+#endif
+#endif
+
+#if SAIT_IMPROV_MOTION_PRED_M24829&!QC_MULTI_DIS_CAN_A0097
 #define PDM_AMVP_POS                      0         // position of pdm in amvp list  (0..3)
 #else
@@ -181 +190 @@
 // VPS constants
 // ====================================================================================================================
+#if QC_MVHEVC_B0046
+#define MAX_LAYER_NUM                     MAX_VIEW_NUM
+#endif
 #if VIDYO_VPS_INTEGRATION
 #define MAX_LAYER_NUM                     MAX_VIEW_NUM
@@ -476 +488 @@
   NAL_UNIT_CODED_SLICE,
 #if H0566_TLA
+#if QC_REM_IDV_B0046
+  NAL_UNIT_RESERVED,
+#else
   NAL_UNIT_CODED_SLICE_IDV,
+#endif
   NAL_UNIT_CODED_SLICE_TLA,
   NAL_UNIT_CODED_SLICE_CRA,
@@ -504 +520 @@
   NAL_UNIT_RESERVED_23,
   NAL_UNIT_UNSPECIFIED_24,
-#if VIDYO_VPS_INTEGRATION
+#if VIDYO_VPS_INTEGRATION|QC_MVHEVC_B0046
   NAL_UNIT_VPS,
 #else