Changeset 296 in 3DVCSoftware for trunk/source/Lib/TLibCommon/CommonDef.h

Timestamp:

20 Feb 2013, 22:07:43 (12 years ago)

Author:

tech

Message:

Reintegrated branch 5.1-dev0 rev. 295.

File:

• trunk/source/Lib/TLibCommon/CommonDef.h (modified) (8 diffs)

trunk/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 || H3D_IVRP )
 #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&!QC_MULTI_DIS_CAN_A0097
+
+#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
@@ -439 +437 @@
 
 // Explicit temporal layer QP offset
-#if H0567_DPB_PARAMETERS_PER_TEMPORAL_LAYER
 #define MAX_TLAYER                  8           ///< max number of temporal layer
-#else
-#define MAX_TLAYER                  4           ///< max number of temporal layer
-#endif
 #define HB_LAMBDA_FOR_LDC           1           ///< use of B-style lambda for non-key pictures in low-delay mode
 
@@ -468 +462 @@
 #define MAX_NUM_REF_PICS 16
 
-#if !NAL_REF_FLAG
-enum NalRefIdc
-{
-  NAL_REF_IDC_PRIORITY_LOWEST = 0,
-  NAL_REF_IDC_PRIORITY_LOW,
-  NAL_REF_IDC_PRIORITY_HIGH,
-  NAL_REF_IDC_PRIORITY_HIGHEST
-};
-#endif
 
 enum NalUnitType
@@ -482 +467 @@
   NAL_UNIT_UNSPECIFIED_0 = 0,
   NAL_UNIT_CODED_SLICE,
-#if H0566_TLA
 #if QC_REM_IDV_B0046
   NAL_UNIT_RESERVED,
@@ -490 +474 @@
   NAL_UNIT_CODED_SLICE_TLA,
   NAL_UNIT_CODED_SLICE_CRA,
-#else
-  NAL_UNIT_CODED_SLICE_DATAPART_A,
-  NAL_UNIT_CODED_SLICE_DATAPART_B,
-  NAL_UNIT_CODED_SLICE_CDR,
-#endif
   NAL_UNIT_CODED_SLICE_IDR,
   NAL_UNIT_SEI,