Ticket #57: invalid_mv_comparison.patch

source/Lib/TLibCommon/TComMotionInfo.h

@@ -100 +100 @@
 #if COM16_C806_GEN_MRG_IMPROVEMENT || COM16_C806_OBMC || VCEG_AZ07_FRUC_MERGE || JVET_C0024_QTBT
   Bool operator== (const TComMvField& rcMv) const
   {
-    return (m_acMv.getHor()== rcMv.getHor() && m_acMv.getVer()== rcMv.getVer() && m_iRefIdx == rcMv.getRefIdx());
+#if POSSIBLE_BUG_FIXES
+    return ( m_iRefIdx == rcMv.getRefIdx() && ( m_iRefIdx == -1 || ( m_acMv.getHor() == rcMv.getHor() && m_acMv.getVer() == rcMv.getVer() ) ) );
+#else
+    return ( m_acMv.getHor() == rcMv.getHor() && m_acMv.getVer() == rcMv.getVer() && m_iRefIdx == rcMv.getRefIdx() );
+#endif
   }
 #endif
 };

source/Lib/TLibCommon/TypeDef.h

@@ -44 +44 @@
 
 #include <vector>
 
+#define POSSIBLE_BUG_FIXES                                1
+
 //! \ingroup TLibCommon
 //! \{
 ///////////////////////////////////////////////////////////