Ticket #54: mods.patch

source/Lib/TLibCommon/TComDataCU.cpp

@@ -3426 +3426 @@
 
           cMv = cMv;
         }
+#if !(NTT_BUG_FIX_CLIP)
         clipMv( cMv );
+#endif
         pcMvFieldNeighbours[(iCount<<1)+refListIdY].setMvField( cMv, i );
 #if H_3D_NBDV
         pcMvFieldNeighbours[(iCount<<1)+refListIdY].getMv().setIDVFlag (false);
@@ -3476 +3478 @@
         {
           cMv.setVer(0);
         }
+#if !(NTT_BUG_FIX_CLIP)
         clipMv( cMv );
+#endif
 
 #if ETRIKHU_MERGE_REUSE_F0093
         rightShiftMergeCandList( pcMvFieldNeighbours, puhInterDirNeighbours, vspFlag, inheritedVSPDisInfo, iCount, (5-iCount), iCount3DV);
@@ -4308 +4312 @@
         const TComMv cAdd( 1 << ( 2 - 1 ), 1 << ( 2 - 1 ) );
         cMvPred+=cAdd;
         cMvPred>>=2;
+#if !(NTT_BUG_FIX_CLIP)
         clipMv(cMvPred);
+#endif
         tmpMV[0].setMvField(cMvPred,tRef[0]);
       }
       if ( getSlice()->isInterB() )
@@ -4321 +4327 @@
           const TComMv cAdd( 1 << ( 2 - 1 ), 1 << ( 2 - 1 ) );
           cMvPred+=cAdd;
           cMvPred>>=2;
+#if !(NTT_BUG_FIX_CLIP)
           clipMv(cMvPred);
+#endif
           tmpMV[1].setMvField(cMvPred,tRef[1]);
         }
       }
@@ -4423 +4431 @@
         const TComMv cAdd( 1 << ( 2 - 1 ), 1 << ( 2 - 1 ) );
         cMvPred+=cAdd;
         cMvPred>>=2;
+#if !(NTT_BUG_FIX_CLIP)
         clipMv(cMvPred);
+#endif
         pcMvFieldNeighbours[iCount<<1].setMvField(cMvPred,iValidDepRef);
       }
       if ( getSlice()->isInterB() )
@@ -4436 +4446 @@
           const TComMv cAdd( 1 << ( 2 - 1 ), 1 << ( 2 - 1 ) );
           cMvPred+=cAdd;
           cMvPred>>=2;
+#if !(NTT_BUG_FIX_CLIP)
           clipMv(cMvPred);
+#endif
           pcMvFieldNeighbours[(iCount<<1)+1].setMvField(cMvPred,iValidDepRef);
         }
       }
@@ -5600 +5612 @@
         const TComMv cAdd( 1 << ( 2 - 1 ), 1 << ( 2 - 1 ) );
         cMvPred+=cAdd;
         cMvPred>>=2;
+#if !(NTT_BUG_FIX_CLIP)
         clipMv(cMvPred);
+#endif
         pcMvFieldNeighbours[iCount<<1].setMvField(cMvPred,iValidDepRef);
       }
 
@@ -5614 +5628 @@
           const TComMv cAdd( 1 << ( 2 - 1 ), 1 << ( 2 - 1 ) );
           cMvPred+=cAdd;
           cMvPred>>=2;
+#if !(NTT_BUG_FIX_CLIP)
           clipMv(cMvPred);
+#endif
           pcMvFieldNeighbours[(iCount<<1)+1].setMvField(cMvPred,iValidDepRef);
         }
       }
@@ -7747 +7763 @@
 
       if( bCheck )
       {
+#if !(NTT_BUG_FIX_CLIP)
         clipMv(cColMv);
+#endif
         pDInfo->m_acNBDV = cColMv;
         pDInfo->m_aVIdxCan  = iTargetViewIdx;
 
@@ -7816 +7834 @@
         if( cIDVInfo.m_bAvailab[iList][curPos] )
         {
           TComMv cDispVec = cIDVInfo.m_acMvCand[iList][ curPos ];
+#if !(NTT_BUG_FIX_CLIP)
           clipMv( cDispVec );
+#endif
           pDInfo->m_acNBDV = cDispVec;
           pDInfo->m_aVIdxCan = cIDVInfo.m_aVIdxCan[iList][ curPos ];
 #if H_3D_NBDV_REF
@@ -7946 +7966 @@
 
     Pel iDisp = getMcpFromDM( pcBaseViewDepthPicYuv, cMvPred, iBlkX, iBlkY, iWidth, iHeight, aiShiftLUT );
     cMvPred->setHor( iDisp );
+#if !(NTT_BUG_FIX_CLIP)
     clipMv(*cMvPred);
+#endif
   }
 }
 #endif //H_3D_NBDV_REF
@@ -7972 +7994 @@
         Int refViewIdx  = pcTmpCU->getSlice()->getRefPic(eRefPicList, refId)->getViewIndex();
         if (refViewIdx != m_pcSlice->getViewIndex()) 
         {
+#if !(NTT_BUG_FIX_CLIP)
           clipMv(cMvPred);
+#endif
           pNbDvInfo->m_acNBDV = cMvPred;
           pNbDvInfo->m_aVIdxCan = refViewIdx;
 #if H_3D_NBDV_REF
@@ -8375 +8399 @@
                       cMv.setIDVVer    (cDv.getVer());  
                       cMv.setIDVVId    (iViewIndex); 
                     }
-
+                    
+#if !(NTT_BUG_FIX_CLIP)
                     clipMv( cMv );
+#endif
                     bLoop_stop = true;
 
                     pcMvFieldSP[2*iPartition + uiCurrRefListId].setMvField(cMv, iPdmRefIdx);
@@ -8507 +8533 @@
                   }
 #endif
 #endif
+#if !(NTT_BUG_FIX_CLIP)
                   clipMv( cMv );
+#endif
                   paiPdmRefIdx  [ (uiCurrRefListId + (iLoopCan<<2)) ] = iPdmRefIdx;
                   pacPdmMv      [ (uiCurrRefListId + (iLoopCan<<2)) ] = cMv;
                   stopLoop = true;
@@ -8556 +8584 @@
             cMv.setHor((cMv.getHor()+2)>>2); 
 #endif
           cMv.setVer( 0 );
+#if !(NTT_BUG_FIX_CLIP)
           clipMv( cMv );
+#endif
           pacPdmMv      [iRefListId + 2 + (iLoopCan<<2)] = cMv;
         }
         break;

source/Lib/TLibCommon/TComPrediction.cpp

@@ -1016 +1016 @@
 
     assert ( cDistparity.bDV );
 
+#if NTT_BUG_FIX_CLIP
+    TComMv cNBDV = cDistparity.m_acNBDV;
+    pcCU->clipMv( cNBDV );
+
+    pcPicYuvRef = pcPicYuvBaseCol->getPicYuvRec();
+    xPredInterLumaBlk  ( pcCU, pcPicYuvRef, uiPartAddr, &cNBDV, iWidth, iHeight, pYuvB0, bi, true );
+    xPredInterChromaBlk( pcCU, pcPicYuvRef, uiPartAddr, &cNBDV, iWidth, iHeight, pYuvB0, bi, true );
+#else
     pcPicYuvRef = pcPicYuvBaseCol->getPicYuvRec();
     xPredInterLumaBlk  ( pcCU, pcPicYuvRef, uiPartAddr, &cDistparity.m_acNBDV, iWidth, iHeight, pYuvB0, bi, true );
     xPredInterChromaBlk( pcCU, pcPicYuvRef, uiPartAddr, &cDistparity.m_acNBDV, iWidth, iHeight, pYuvB0, bi, true );
-    
+#endif    
     pcPicYuvRef = pcPicYuvBaseRef->getPicYuvRec();
     xPredInterLumaBlk  ( pcCU, pcPicYuvRef, uiPartAddr, &cMVwithDisparity, iWidth, iHeight, pYuvB1, bi, true );
     xPredInterChromaBlk( pcCU, pcPicYuvRef, uiPartAddr, &cMVwithDisparity, iWidth, iHeight, pYuvB1, bi, true );

source/Lib/TLibCommon/TypeDef.h

@@ -38 +38 @@
 #ifndef _TYPEDEF__
 #define _TYPEDEF__
 
+#define NTT_BUG_FIX_CLIP 1
+
 //! \ingroup TLibCommon
 //! \{
 /////////////////////////////////////////////////////////////////////////////////////////