Changeset 1387 in SHVCSoftware for branches/SHM-dev/source/Lib/TLibCommon

Timestamp:

4 Aug 2015, 02:53:17 (10 years ago)

Author:

seregin

Message:

port rev 4522 and rev 4523

Location:

branches/SHM-dev/source/Lib/TLibCommon

Files:

• Debug.cpp (modified) (1 diff)
• TComMv.h (modified) (1 diff)
• TypeDef.h (modified) (1 diff)

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

@@ -179 +179 @@
   PRINT_CONSTANT(O0043_BEST_EFFORT_DECODING,                                        settingNameWidth, settingValueWidth);
 
+  PRINT_CONSTANT(ME_ENABLE_ROUNDING_OF_MVS,                                         settingNameWidth, settingValueWidth);
+
   //------------------------------------------------
 

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

@@ -116 +116 @@
   }
 
+#if ME_ENABLE_ROUNDING_OF_MVS
+  //! shift right with rounding
+  Void divideByPowerOf2 (const Int i)
+  {
+    int offset = (i == 0) ? 0 : 1 << (i - 1); 
+    m_iHor += offset;
+    m_iVer += offset;
+
+    m_iHor >>= i;
+    m_iVer >>= i;
+  }
+#endif
+
   const TComMv& operator<<= (const Int i)
   {

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

@@ -190 +190 @@
 #define O0043_BEST_EFFORT_DECODING                        0 ///< 0 (default) = disable code related to best effort decoding, 1 = enable code relating to best effort decoding [ decode-side only ].
 
+#define ME_ENABLE_ROUNDING_OF_MVS                         1 ///< 0 (default) = disables rounding of motion vectors when right shifted,  1 = enables rounding
+
 #define RDOQ_CHROMA_LAMBDA                                1 ///< F386: weighting of chroma for RDOQ