Changeset 479 in 3DVCSoftware for branches/HTM-DEV-0.3-dev2/source/Lib/TLibCommon/CommonDef.h

Timestamp:

18 Jun 2013, 23:24:53 (11 years ago)

Author:

tech

Message:

• changed IV-MERGE HLS to match Test Model 4 spec
• incorporated iv-refpic list to TComSlice
• removed TComDepthMapGenerator

File:

• branches/HTM-DEV-0.3-dev2/source/Lib/TLibCommon/CommonDef.h (modified) (2 diffs)

branches/HTM-DEV-0.3-dev2/source/Lib/TLibCommon/CommonDef.h

@@ -178 +178 @@
 }
 
-#if H_3D_IV_MERGE
-#define ROFVS( exp )          \
-{                             \
-  if( !( exp ) )              \
-{                           \
-  return;                   \
-}                           \
-}
-
-#define ROTVS( exp )          \
-{                             \
-  if( ( exp ) )               \
-{                           \
-  return;                   \
-}                           \
-}
-
-#define ROTRS( exp, retVal )  \
-{                             \
-  if( ( exp ) )               \
-{                           \
-  return retVal;            \
-}                           \
-}
-
-#define ROFRS( exp, retVal )  \
-{                             \
-  if( !( exp ) )              \
-{                           \
-  return retVal;            \
-}                           \
-}
-#endif
 template <typename T>
 __inline T gSign(const T& t)
@@ -360 +327 @@
 #define STD_CAM_PARAMETERS_PRECISION 5        ///< quarter luma sample accuarcy for derived disparities (as default)
 
-#if H_3D_IV_MERGE
- // GT: To be checked if all of this is still necessary. 
-#define PDM_USE_FOR_IVIEW                 1
-#define PDM_USE_FOR_INTER                 2
-#define PDM_USE_FOR_MERGE                 4
-
-#define MAX_VIEW_NUM                      10
-#define PDM_SUBSAMPLING_EXP               2         // subsampling factor is 2^PDM_SUBSAMPLING_EXP
-#define PDM_SUB_SAMP_EXP_X(Pdm)           ((Pdm)==1?PDM_SUBSAMPLING_EXP:0)
-#define PDM_SUB_SAMP_EXP_Y(Pdm)           ((Pdm)==1?PDM_SUBSAMPLING_EXP:0)
-
-#define PDM_INTERNAL_CALC_BIT_DEPTH       31        // bit depth for internal calculations (32 - 1 for signed values)
-#define PDM_BITDEPTH_VIRT_DEPTH           15        // bit depth for virtual depth storage (16 - 1 for signed values)
-#define PDM_LOG2_MAX_ABS_NORMAL_DISPARITY 8         // maximum absolute normal disparity = 256 (for setting accuracy)
-#define PDM_VIRT_DEPTH_PRECISION          4         // must be greater than or equal to 2 (since MVs are given in quarter-pel units)
-
-#define PDM_INTER_CALC_SHIFT              ( PDM_INTERNAL_CALC_BIT_DEPTH - PDM_BITDEPTH_VIRT_DEPTH )         // avoids overflow
-#define PDM_LOG4_SCALE_DENOMINATOR        ( PDM_LOG2_MAX_ABS_NORMAL_DISPARITY + PDM_VIRT_DEPTH_PRECISION )  // accuracy of scaling factor
-#define PDM_OFFSET_SHIFT                  ( PDM_LOG2_MAX_ABS_NORMAL_DISPARITY )                             // accuracy of offset
-
-#endif
 #endif // end of H_3D
 //! \}