Changeset 1255 in 3DVCSoftware for branches/HTM-14.1-update-dev3-NTT/source/Lib/TLibCommon/TypeDef.h

Timestamp:

11 Jun 2015, 01:07:43 (9 years ago)

Author:

ntt

Message:

Reactivation of VSP

File:

• branches/HTM-14.1-update-dev3-NTT/source/Lib/TLibCommon/TypeDef.h (modified) (2 diffs)

branches/HTM-14.1-update-dev3-NTT/source/Lib/TLibCommon/TypeDef.h

@@ -72 +72 @@
 #define NH_3D_NBDV_REF                    1
 #define NH_3D_MLC                         1
+#define NH_3D_VSP                         1
 #endif
 
@@ -312 +313 @@
 /// GT: Move values which are not flags to CommonDef.h and convert to static int !!
 ///////////////////////////////////////////////////////////////////////////////////
-///// ***** VIEW SYNTHESIS PREDICTION *********
-#if H_3D_VSP
-#define H_3D_VSP_BLOCKSIZE                4   // Supported values: 1, 2, and 4
-#if H_3D_VSP_BLOCKSIZE == 1
-#define H_3D_VSP_CONSTRAINED              1   // Constrained VSP @ 1x1
-#else
-#define H_3D_VSP_CONSTRAINED              0
-#endif
-#endif
 ///// ***** ILLUMATION COMPENSATION *********
 #if H_3D_IC