Changeset 1029 in SHVCSoftware for branches/SHM-dev/source/Lib/TLibCommon/CommonDef.h

Timestamp:

26 Feb 2015, 00:21:54 (10 years ago)

Author:

seregin

Message:

merge with SHM-upgrade branch

Location:

branches/SHM-dev

Files:

• . (modified) (1 prop)
• source (modified) (1 prop)
• source/Lib/TLibCommon/CommonDef.h (modified) (8 diffs)

branches/SHM-dev/source/Lib/TLibCommon/CommonDef.h

@@ -40 +40 @@
 
 #include <algorithm>
+#include <iostream>
+#include <assert.h>
 
 #if _MSC_VER > 1000
 // disable "signed and unsigned mismatch"
 #pragma warning( disable : 4018 )
-// disable bool coercion "performance warning"
+// disable Bool coercion "performance warning"
 #pragma warning( disable : 4800 )
 #endif // _MSC_VER > 1000
@@ -58 +60 @@
 #if SVC_EXTENSION
 #include <vector>
-#define NV_VERSION        "8.0 (HM-15.0)"                 ///< Current software version
-#else
-#define NV_VERSION        "15.0"                ///< Current software version
+#define NV_VERSION        "8.1 (HM-16.2)"                 ///< Current software version
+#else
+#define NV_VERSION        "16.2"                ///< Current software version
 #endif
 
@@ -98 +100 @@
 #endif
 
-#define NVM_BITS          "[%d bit] ", (sizeof(void*) == 8 ? 64 : 32) ///< used for checking 64-bit O/S
+#define NVM_BITS          "[%d bit] ", (sizeof(Void*) == 8 ? 64 : 32) ///< used for checking 64-bit O/S
 
 #ifndef NULL
@@ -119 +121 @@
 #define MAX_INT                     2147483647  ///< max. value of signed 32-bit integer
 #define MAX_INT64                   0x7FFFFFFFFFFFFFFFLL  ///< max. value of signed 64-bit integer
-#define MAX_DOUBLE                  1.7e+308    ///< max. value of double-type value
+#if RExt__HIGH_BIT_DEPTH_SUPPORT
+#define MAX_INTERMEDIATE_INT        MAX_INT64
+#else
+#define MAX_INTERMEDIATE_INT        MAX_INT
+#endif
+
+#define MAX_DOUBLE                  1.7e+308    ///< max. value of Double-type value
 
 #define MIN_QP                      0
@@ -129 +137 @@
 // Macro functions
 // ====================================================================================================================
-extern Int g_bitDepthY;
-extern Int g_bitDepthC;
+
+extern Int g_bitDepth[MAX_NUM_CHANNEL_TYPE];
+
 #if O0194_DIFFERENT_BITDEPTH_EL_BL
-extern Int  g_bitDepthYLayer[MAX_LAYERS];
-extern Int  g_bitDepthCLayer[MAX_LAYERS];
-
-extern UInt g_uiPCMBitDepthLumaDec[MAX_LAYERS];    // PCM bit-depth
-extern UInt g_uiPCMBitDepthChromaDec[MAX_LAYERS];    // PCM bit-depth
+extern Int  g_bitDepthLayer[MAX_NUM_CHANNEL_TYPE][MAX_LAYERS];
 #endif
 #if O0194_WEIGHTED_PREDICTION_CGS
 extern void* g_refWeightACDCParam; //type:wpACDCParam
 #endif
-/** clip x, such that 0 <= x <= #g_maxLumaVal */
-template <typename T> inline T ClipY(T x) { return std::min<T>(T((1 << g_bitDepthY)-1), std::max<T>( T(0), x)); }
-template <typename T> inline T ClipC(T x) { return std::min<T>(T((1 << g_bitDepthC)-1), std::max<T>( T(0), x)); }
-
-/** clip a, such that minVal <= a <= maxVal */
-template <typename T> inline T Clip3( T minVal, T maxVal, T a) { return std::min<T> (std::max<T> (minVal, a) , maxVal); }  ///< general min/max clip
+
+template <typename T> inline T Clip3 (const T minVal, const T maxVal, const T a) { return std::min<T> (std::max<T> (minVal, a) , maxVal); }  ///< general min/max clip
+template <typename T> inline T ClipBD(const T x, const Int bitDepth)             { return Clip3(T(0), T((1 << bitDepth)-1), x);           }
+template <typename T> inline T Clip  (const T x, const ChannelType type)         { return ClipBD(x, g_bitDepth[type]);                    }
+
+template <typename T> inline Void Check3( T minVal, T maxVal, T a)
+{
+  if ((a > maxVal) || (a < minVal))
+  {
+    std::cerr << "ERROR: Range check " << minVal << " >= " << a << " <= " << maxVal << " failed" << std::endl;
+    assert(false);
+    exit(1);
+  }
+}  ///< general min/max clip
 
 #define DATA_ALIGN                  1                                                                 ///< use 32-bit aligned malloc/free
@@ -163 +176 @@
 }
 
+template <typename ValueType> inline ValueType leftShift       (const ValueType value, const Int shift) { return (shift >= 0) ? ( value                                  << shift) : ( value                                   >> -shift); }
+template <typename ValueType> inline ValueType rightShift      (const ValueType value, const Int shift) { return (shift >= 0) ? ( value                                  >> shift) : ( value                                   << -shift); }
+template <typename ValueType> inline ValueType leftShift_round (const ValueType value, const Int shift) { return (shift >= 0) ? ( value                                  << shift) : ((value + (ValueType(1) << (-shift - 1))) >> -shift); }
+template <typename ValueType> inline ValueType rightShift_round(const ValueType value, const Int shift) { return (shift >= 0) ? ((value + (ValueType(1) << (shift - 1))) >> shift) : ( value                                   << -shift); }
+#if O0043_BEST_EFFORT_DECODING
+// when shift = 0, returns value
+// when shift = 1, (value + 0 + value[1]) >> 1
+// when shift = 2, (value + 1 + value[2]) >> 2
+// when shift = 3, (value + 3 + value[3]) >> 3
+template <typename ValueType> inline ValueType rightShiftEvenRounding(const ValueType value, const UInt shift) { return (shift == 0) ? value : ((value + (1<<(shift-1))-1 + ((value>>shift)&1)) >> shift) ; }
+#endif
 
 // ====================================================================================================================
@@ -255 +279 @@
   NAL_UNIT_PREFIX_SEI,              // 39
   NAL_UNIT_SUFFIX_SEI,              // 40
+
   NAL_UNIT_RESERVED_NVCL41,
   NAL_UNIT_RESERVED_NVCL42,
@@ -286 +311 @@
   Int m_targetLayerId;
   Int m_targetOutputLayerSetIdx;
-  std::vector<Int> *m_targetDecLayerIdSet; 
+  std::vector<Int> *m_targetDecLayerIdSet;
   Bool m_valueCheckedFlag;
   Int m_highestTId;
 public:
-  CommonDecoderParams(): 
+  CommonDecoderParams():
 #if FIX_CONF_MODE
     m_targetLayerId(MAX_VPS_LAYER_ID_PLUS1)