Changeset 1158 in 3DVCSoftware for branches/HTM-13.1-dev2-Sony/source/Lib/TLibCommon

Timestamp:

3 Mar 2015, 10:44:14 (10 years ago)

Author:

sony

Message:

Fix for SONY_MV_V_CONST_C0078
1) search range limit to consider sub-pel search
2) added disparity vector check module

ohji.nakagami@…

Location:

branches/HTM-13.1-dev2-Sony/source/Lib/TLibCommon

Files:

• TComDataCU.cpp (modified) (1 diff)
• TComDataCU.h (modified) (1 diff)
• TComPrediction.cpp (modified) (1 diff)

branches/HTM-13.1-dev2-Sony/source/Lib/TLibCommon/TComDataCU.cpp

@@ -5341 +5341 @@
 }
 
+#if SONY_MV_V_CONST_C0078
+Void TComDataCU::checkMV_V (TComMv&  rcMv,  RefPicList eRefPicList, int iRefIdx )
+{
+  if ( getSlice()->getSPS()->getInterViewMvVertConstraintFlag() )
+  {
+    if ( getSlice()->getRefPic( eRefPicList, iRefIdx )->getPOC() == getSlice()->getPOC() )
+    {
+        //When inter_view_mv_vert_constraint_flag is equal to 1,
+        //the vertical component of the motion vectors used for inter-layer prediction 
+        //shall be equal to or less than 56 in units of luma samples
+        assert ( rcMv.getVer() <= (56<<2) );
+    }
+  }
+}
+#endif
+
 UInt TComDataCU::getIntraSizeIdx(UInt uiAbsPartIdx)
 {

branches/HTM-13.1-dev2-Sony/source/Lib/TLibCommon/TComDataCU.h

@@ -591 +591 @@
   
   Void          clipMv                ( TComMv&     rcMv     );
+#if SONY_MV_V_CONST_C0078
+  Void          checkMV_V (TComMv&  rcMv,  RefPicList eRefPicList, int iRefIdx );
+#endif
   Void          getMvPredLeft         ( TComMv&     rcMvPred )   { rcMvPred = m_cMvFieldA.getMv(); }
   Void          getMvPredAbove        ( TComMv&     rcMvPred )   { rcMvPred = m_cMvFieldB.getMv(); }

branches/HTM-13.1-dev2-Sony/source/Lib/TLibCommon/TComPrediction.cpp

@@ -1293 +1293 @@
   TComMv      cMv         = pcCU->getCUMvField( eRefPicList )->getMv( uiPartAddr );
   pcCU->clipMv(cMv);
-
+#if SONY_MV_V_CONST_C0078
+  pcCU->checkMV_V(cMv, eRefPicList, iRefIdx );
+#endif
 #if H_3D_ARP
   if(pcCU->getARPW( uiPartAddr ) > 0  && pcCU->getSlice()->getRefPic( eRefPicList, iRefIdx )->getPOC()== pcCU->getSlice()->getPOC())