Changeset 911 in 3DVCSoftware for branches/HTM-10.2-dev1-ETRI/source/Lib/TLibCommon/TypeDef.h

Timestamp:

13 Apr 2014, 14:27:40 (10 years ago)

Author:

etri-htm

Message:

H0083 Bug-fix and clean ups on merge list construction

File:

• branches/HTM-10.2-dev1-ETRI/source/Lib/TLibCommon/TypeDef.h (modified) (3 diffs)

branches/HTM-10.2-dev1-ETRI/source/Lib/TLibCommon/TypeDef.h

@@ -39 +39 @@
 #define _TYPEDEF__
 
+
 //! \ingroup TLibCommon
 //! \{
@@ -223 +224 @@
                                               // SCU_HS_FAST_DEPTH_INTRA_E0238_HHIFIX
 #endif
+
+#define ETRIKHU_BUGFIX_H0083              1   // bug-fix for DV candidate pruning
+#define ETRIKHU_CLEANUP_H0083             1   // cleaned-up source code for constructing merging candidate list
 
 // Rate Control
@@ -799 +803 @@
 };
 
+/// merging candidates
+#if ETRIKHU_CLEANUP_H0083
+enum DefaultMergCandOrder
+{
+  MRG_T = 0,            ///< MPI
+  MRG_D,                ///< DDD
+  MRG_IVMC,             ///< Temporal inter-view
+  MRG_A1,               ///< Left
+  MRG_B1,               ///< Above
+  MRG_B0,               ///< Above right
+  MRG_IVDC,             ///< Disparity inter-view
+  MRG_VSP,              ///< VSP
+  MRG_A0,               ///< Left bottom
+  MRG_B2,               ///< Above left
+  MRG_IVSHIFT,          ///< Shifted IVMC of Shifted IVDC. (These are mutually exclusive)
+  MRG_COL               ///< Temporal co-located
+};
+#endif
+
 /// coefficient scanning type used in ACS
 enum COEFF_SCAN_TYPE