Changeset 28 in 3DVCSoftware for branches/0.3-poznan-univ/source/Lib/TLibCommon/CommonDef.h

Timestamp:

24 Feb 2012, 20:22:58 (15 years ago)

Author:

poznan-univ

Message:

Poznan Tools

• Encoding only disoccluded CUs in depended views
• Depth based motion prediction
• Texture QP adjustment based on depth data
• Nonlinear depth representation

File:

• branches/0.3-poznan-univ/source/Lib/TLibCommon/CommonDef.h (modified) (4 diffs)

branches/0.3-poznan-univ/source/Lib/TLibCommon/CommonDef.h

@@ -138 +138 @@
 
 
-#if ( HHI_INTER_VIEW_MOTION_PRED || HHI_INTER_VIEW_RESIDUAL_PRED )
+#if ( HHI_INTER_VIEW_MOTION_PRED || HHI_INTER_VIEW_RESIDUAL_PRED || POZNAN_MP_USE_DEPTH_MAP_GENERATION)
 #define DEPTH_MAP_GENERATION        1
 #else
 #define DEPTH_MAP_GENERATION        0
+#endif
+
+#if POZNAN_NONLINEAR_DEPTH
+#define POZNAN_LUT_INCREASED_PRECISION 0 // 1 //to do
+#else
+#define POZNAN_LUT_INCREASED_PRECISION 0
 #endif
 
@@ -174 +180 @@
 #define OUTPUT_RESIDUAL_PICTURES          0         // output residual pictures (for debugging)
 
-#define HHI_MPI_MERGE_POS                     0         // position of mvi in merge list (0..5)
-
+#define HHI_MPI_MERGE_POS                 0         // position of mvi in merge list (0..5)
+
+// ====================================================================================================================
+// POZNAN DEFINE SECTION
+// ====================================================================================================================
+#define POZNAN_OUTPUT_AVAILABLE_MAP       0           // output available map (for debugging)
+#define POZNAN_OUTPUT_SYNTH               0           // output synthesised view (for debugging)
+
+#if POZNAN_DBMP
+#define POZNAN_DBMP_MERGE_POS             0         // position of DBMP candidate in merge list for coding (0..6) - overwrites PDM_MERGE_POS settings, is overwritten by HHI_MPI_MERGE_POS settings!!!
+#endif
+
+#if POZNAN_NONLINEAR_DEPTH
+inline UChar quantizeDepthPower(Float fDepthPower)
+{
+  Int r = (Int) ( (fDepthPower-1.0f)*128.0f + 0.5f);
+  if (r<=0) return 0;
+  if (r>255) r=255;  
+  return r;
+};
+
+inline Float dequantizeDepthPower(Int iDepthQuant)
+{
+  return iDepthQuant/128.0f + 1.0f;  
+};
+#endif
 
 // ====================================================================================================================
@@ -186 +216 @@
 #define Clip(x)                     ( Min(g_uiIBDI_MAX, Max( 0, (x)) ) )                              ///< clip with bit-depth range
 #define Clip3( MinVal, MaxVal, a)   ( ((a)<(MinVal)) ? (MinVal) : (((a)>(MaxVal)) ? (MaxVal) :(a)) )  ///< general min/max clip
-#define RemoveBitIncrement(x)       ( (x + ( (1 << g_uiBitIncrement) >> 1 )) >> g_uiBitIncrement )     ///< Remove Bit increment
+#define RemoveBitIncrement(x)       ( ((x) + ( (1 << g_uiBitIncrement) >> 1 )) >> g_uiBitIncrement )     ///< Remove Bit increment
+
+#if POZNAN_LUT_INCREASED_PRECISION
+#define RemoveBitIncrementLUT(x)       (x)     ///< Remove Bit increment
+#define SizeOfLUT                      (256 << g_uiBitIncrement)  
+#else
+#define SizeOfLUT                      256
+#define RemoveBitIncrementLUT(x)       ( ((x) + ( (1 << g_uiBitIncrement) >> 1 )) >> g_uiBitIncrement )     ///< Remove Bit increment
+#endif
 
 #define DATA_ALIGN                  1                                                                 ///< use 32-bit aligned malloc/free
@@ -216 +254 @@
 #define AMVP_MAX_NUM_CANDS          6           ///< max number of final candidates
 // MERGE
+#if POZNAN_DBMP
+#define MRG_MAX_NUM_CANDS           7
+#define POZNAN_DBMP_MRG_CAND    MRG_MAX_NUM_CANDS-1                     // position of DBMP candidate in merge list (0..6)
+#else
 #define MRG_MAX_NUM_CANDS           6
+#endif
 
 // Reference memory management