Changeset 292 in 3DVCSoftware for branches/HTM-5.1-dev0/source/Lib/TLibCommon/CommonDef.h

Timestamp:

19 Feb 2013, 17:50:51 (11 years ago)

Author:

tech

Message:

Removed macros related to IV motion parameter prediction.

File:

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

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

@@ -128 +128 @@
 #define MAX_VIEW_NUM                10
 
-#if ( HHI_INTER_VIEW_MOTION_PRED || HHI_INTER_VIEW_RESIDUAL_PRED )
+#if ( H3D_IVMP || HHI_INTER_VIEW_RESIDUAL_PRED )
 #define DEPTH_MAP_GENERATION        1
 #define PDM_REMOVE_DEPENDENCE       1      //bug-fix for DMDV JCT2-A0095
@@ -140 +140 @@
 #define PDM_MERGE_POS                     0         // position of pdm in merge list (0..4)
 
-#if QC_MRG_CANS_B0048
-#if OL_DISMV_POS_B0069
+#if H3D_IVMP
 #define DMV_MERGE_POS                     4
 #else
 #define DMV_MERGE_POS                     1
 #endif
-#endif
-
-#if SAIT_IMPROV_MOTION_PRED_M24829&!H3D_NBDV
+
+#if H3D_IVMP&!H3D_NBDV
 #define PDM_AMVP_POS                      0         // position of pdm in amvp list  (0..3)
 #else
@@ -424 +422 @@
 // AMVP: advanced motion vector prediction
 #define AMVP_MAX_NUM_CANDS          2           ///< max number of final candidates
-#if HHI_INTER_VIEW_MOTION_PRED
+#if H3D_IVMP
 #define AMVP_MAX_NUM_CANDS_MEM      4           ///< max number of candidates
 #else
@@ -431 +429 @@
 // MERGE
 #define MRG_MAX_NUM_CANDS           5
-#if HHI_INTER_VIEW_MOTION_PRED
+#if H3D_IVMP
 #define MRG_MAX_NUM_CANDS_MEM       (MRG_MAX_NUM_CANDS+1) // one extra for inter-view motion prediction
 #endif