Ticket #1418: IBCcheck.patch

Lib/TLibCommon/TypeDef.h

@@ -45 +45 @@
 #include <vector>
 #include <cstdlib>
 
+#define IBC_BUGFIX              1
+
 //! \ingroup TLibCommon
 //! \{
 

Lib/TLibEncoder/TEncCu.cpp

@@ -2342 +2342 @@
 
 #if AMP_MRG
   rpcTempCU->setMergeAMP (true);
+#if IBC_BUGFIX
+  Bool valid = 
+#endif
   m_pcPredSearch->predInterSearch ( rpcTempCU, m_ppcOrigYuv[uhDepth], m_ppcPredYuvTemp[uhDepth], m_ppcResiYuvTemp[uhDepth], m_ppcRecoYuvTemp[uhDepth] DEBUG_STRING_PASS_INTO(sTest), false, bUseMRG, iMVCandList );
 #else
   m_pcPredSearch->predInterSearch ( rpcTempCU, m_ppcOrigYuv[uhDepth], m_ppcPredYuvTemp[uhDepth], m_ppcResiYuvTemp[uhDepth], m_ppcRecoYuvTemp[uhDepth], false, iMVCandList );
 #endif
 
+#if IBC_BUGFIX
+  if( !valid )
+  {
+    return;
+  }
+#endif
+
 #if AMP_MRG
   if ( !rpcTempCU->getMergeAMP() )
   {

Lib/TLibEncoder/TEncSearch.cpp

@@ -6474 +6474 @@
 
 //! search of the best candidate for inter prediction
 #if AMP_MRG
+#if IBC_BUGFIX
+Bool TEncSearch::predInterSearch( TComDataCU* pcCU, TComYuv* pcOrgYuv, TComYuv* pcPredYuv, TComYuv* pcResiYuv, TComYuv* pcRecoYuv DEBUG_STRING_FN_DECLARE(sDebug), Bool bUseRes, Bool bUseMRG, TComMv* iMVCandList )
+#else
 Void TEncSearch::predInterSearch( TComDataCU* pcCU, TComYuv* pcOrgYuv, TComYuv* pcPredYuv, TComYuv* pcResiYuv, TComYuv* pcRecoYuv DEBUG_STRING_FN_DECLARE(sDebug), Bool bUseRes, Bool bUseMRG, TComMv* iMVCandList )
+#endif
 #else
 Void TEncSearch::predInterSearch( TComDataCU* pcCU, TComYuv* pcOrgYuv, TComYuv* pcPredYuv, TComYuv* pcResiYuv, TComYuv* pcRecoYuv, Bool bUseRes, TComMv* iMVCandList )
 #endif
@@ -7024 +7028 @@
         pcCU->setMVPIdxSubParts( -1, REF_PIC_LIST_1, uiPartAddr, iPartIdx, pcCU->getDepth(uiPartAddr));
         pcCU->setMVPNumSubParts( -1, REF_PIC_LIST_1, uiPartAddr, iPartIdx, pcCU->getDepth(uiPartAddr));
       }
+#if IBC_BUGFIX
+      else if( uiMECost < std::numeric_limits<Distortion>::max() )
+#else
       else
+#endif
       {
         // set ME result
         pcCU->setMergeFlagSubParts( false,        uiPartAddr, iPartIdx, pcCU->getDepth( uiPartAddr ) );
@@ -7032 +7040 @@
         pcCU->getCUMvField( REF_PIC_LIST_0 )->setAllMvField( cMEMvField[0], ePartSize, uiPartAddr, 0, iPartIdx );
         pcCU->getCUMvField( REF_PIC_LIST_1 )->setAllMvField( cMEMvField[1], ePartSize, uiPartAddr, 0, iPartIdx );
       }
+#if IBC_BUGFIX
+      else
+      {
+        return false;
+      }
+#endif
     }
 
     //  MC
@@ -7041 +7055 @@
 
   setWpScalingDistParam( pcCU, -1, REF_PIC_LIST_X );
 
+#if IBC_BUGFIX
+  return true;
+#else
   return;
+#endif
 }
 
 Bool TEncSearch::isBlockVectorValid( Int xPos, Int yPos, Int width, Int height, TComDataCU *pcCU, UInt uiAbsPartIdx,

Lib/TLibEncoder/TEncSearch.h

@@ -282 +282 @@
                                           );
 
   /// encoder estimation - inter prediction (non-skip)
+#if IBC_BUGFIX
+  Bool predInterSearch          ( TComDataCU* pcCU,
+#else
   Void predInterSearch          ( TComDataCU* pcCU,
+#endif
                                   TComYuv*    pcOrgYuv,
                                   TComYuv*    pcPredYuv,
                                   TComYuv*    pcResiYuv,