Changeset 1283 in SHVCSoftware

Timestamp:

16 Jul 2015, 23:55:03 (9 years ago)

Author:

seregin

Message:

port rev 4313

Location:

branches/SHM-dev/source/Lib

Files:

• TLibCommon/CommonDef.h (modified) (2 diffs)
• TLibCommon/TComTrQuant.cpp (modified) (1 diff)
• TLibEncoder/TEncSearch.cpp (modified) (1 diff)
• TLibVideoIO/TVideoIOYuv.cpp (modified) (1 diff)

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

@@ -51 +51 @@
 #include "TypeDef.h"
 
+#ifdef _MSC_VER
+#if _MSC_VER <= 1500
+inline Int64 abs (Int64 x) { return _abs64(x); };
+#endif
+#endif
+
 //! \ingroup TLibCommon
 //! \{
@@ -60 +66 @@
 #if SVC_EXTENSION
 #include <vector>
-#define NV_VERSION        "9.0 (HM-16.3)"                 ///< Current software version
-#else
-#define NV_VERSION        "16.3"                ///< Current software version
+#define NV_VERSION        "9.0 (HM-16.3)"        ///< Current SHM software version
+#else
+#define NV_VERSION        "16.3"                 ///< Current software version
 #endif
 

branches/SHM-dev/source/Lib/TLibCommon/TComTrQuant.cpp

@@ -1702 +1702 @@
       {
         pcCoeff[coefficientIndex] = encoderSideDelta;
-        reconstructedDelta        = encoderSideDelta;
+        reconstructedDelta        = (Pel) encoderSideDelta;
       }
       else

branches/SHM-dev/source/Lib/TLibEncoder/TEncSearch.cpp

@@ -364 +364 @@
     Int isubShift = 0;
     // motion cost
-    UInt uiBitCost = m_pcRdCost->getCost( iSearchX, iSearchY );
+    Distortion uiBitCost = m_pcRdCost->getCost( iSearchX, iSearchY );
 
     if ( m_cDistParam.iRows > 32 )

branches/SHM-dev/source/Lib/TLibVideoIO/TVideoIOYuv.cpp

@@ -218 +218 @@
   /* fall back to consuming the input */
   Char buf[512];
-  const UInt offset_mod_bufsize = offset % sizeof(buf);
+  const streamoff offset_mod_bufsize = offset % sizeof(buf);
   for (streamoff i = 0; i < offset - offset_mod_bufsize; i += sizeof(buf))
   {