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

Timestamp:

11 Mar 2016, 16:54:51 (9 years ago)

Author:

tech

Message:

Merged HTM-16.0-dev1@1395.

File:

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

trunk/source/Lib/TLibCommon/TypeDef.h

@@ -65 +65 @@
 #if NH_MV
 // Recent bug fixes
-#define NH_3D_FIX_TICKET_107                     1 // Clean up. 
-#define NH_3D_FIX_TICKET_91                      1 // NBDV availability in case of tiles.
+#define RM_INIT_FIX                      1
+#define RM_FIX_SETUP                     1
+#define NH_MV_FIX_VERT_MV_REST                         1
+
+#define NH_3D_FIX_INTRA_SDC_VSO_OFF              1
+#define NH_3D_FIX_TICKET_114                     1  //Mismatch between text and software on DPB size syntax
+#define NH_3D_FIX_LEAK                           1
 // Things that needs to be fixed also in the Specification ...
 #define NH_MV_FIX_NO_REF_PICS_CHECK               1 // !!SPEC!!
@@ -349 +354 @@
 #endif
 // This can be enabled by the makefile
-#if !NH_MV
 #ifndef ENC_DEC_TRACE
 #define ENC_DEC_TRACE                                     0
+#endif
+
+#if NH_MV
+#if ENC_DEC_TRACE
+#define GT_DEBUG   1
+#else
+#define GT_DEBUG   0
 #endif
 #endif
@@ -510 +521 @@
 #define       RDO_DIST_MAX     MAX_UINT
 #endif
+#else
+#define       RDO_DIST_MAX     MAX_UINT
 #endif
 // ====================================================================================================================
@@ -1000 +1013 @@
   BLEND_GEN   =  3
 };
+
+  enum SetMod
+  {
+    GET_FULL   = 0,
+    SET_FULL   = 1,
+    GET_SIMP   = 2,
+    SET_SIMP   = 3    
+  };
+
+  
 enum
 {