Changeset 210 in 3DVCSoftware for trunk/source/Lib/TLibCommon/TypeDef.h

Timestamp:

11 Dec 2012, 18:52:43 (12 years ago)

Author:

tech

Message:

Reintegrated /branches/HTM-5.0-dev0 rev. 207.

File:

• trunk/source/Lib/TLibCommon/TypeDef.h (modified) (4 diffs)

trunk/source/Lib/TLibCommon/TypeDef.h

@@ -41 +41 @@
 //! \ingroup TLibCommon
 //! \{
-
+#define QC_MVHEVC_B0046                   0   //JCT3V-B0046: disable 3DHEVC tools
+#define QC_IV_AS_LT_B0046                 1   //JCT3V-B0046: inter-view reference pictures are treated as long-term pictures, scaling of motion vectors for DCP based on ViewId/ViewOrderIdx is disabled  
+#define QC_TMVP_IDX_MOD_B0046             1   //JCT3V-B0046: the reference index for temporal merging candidate is set to 0, as defined in HEVC
+#define QC_REM_IDV_B0046                  1   //JCT3V-B0046: removal of IDV NAL unit type
+#define FIX_DEL_NULLPTR                   1
+#define FIX_MISUSE_REFINDEX               1
+#define FIX_FCO_COMP_WARNING              1
+#define DV_V_RESTRICTION_B0037            1   // JCT3V-B0037 disparity vector vertical range restriction
+
+#if !QC_MVHEVC_B0046
 ///// ***** FIXES *********
 // A
@@ -52 +61 @@
 #define FIX_DMM_NEG_DIST                  1
 #define FIX_LGE_DVMCP_B0133               1
-#define FIX_MISUSE_REFINDEX               1
-
+
+
+// FCO 
+#define FLEX_CODING_ORDER_M23723          1
+#if FLEX_CODING_ORDER_M23723
+  #define DISABLE_FCO_FOR_VSO             0 // Optional compile settings to disable VSO with FCO.
+#endif
 
 ///// ***** PATCHES *********
@@ -178 +192 @@
 
 #define HHI_MPI_MERGE_POS                 0
-
+#endif
 ///// ***** HM 6.1 *********
 #define SKIPFRAME_BUGFIX                  1 ///< bug fix to enable skipFrame at decoder
@@ -478 +492 @@
 // VPS INTEGRATION
 // ====================================================================================================================
-
+#if !QC_MVHEVC_B0046
 #if VIDYO_VPS_INTEGRATION
 #define MAX_NUM_VPS 10
 #endif
+#else
+#define MAX_NUM_VPS 1
+#endif
+
 
 // ====================================================================================================================