Changeset 1177 in 3DVCSoftware for branches

Timestamp:

7 Apr 2015, 15:52:38 (10 years ago)

Author:

tech

Message:

Fix ViewId based inter-view motion vector scaling.

Location:

branches/HTM-13.1-dev0

Files:

• codingresults/1177_IvMvVIdFix_vs_1176_FixColourPlanesOff.xls (added)
• source/Lib/TLibCommon/TComDataCU.cpp (modified) (1 diff)
• source/Lib/TLibCommon/TypeDef.h (modified) (1 diff)

branches/HTM-13.1-dev0/source/Lib/TLibCommon/TComDataCU.cpp

@@ -5804 +5804 @@
   {
 #if H_3D_TMVP
+#if !H_3D_FIX_TMVP_SCALING_VIEW_ID
     Int iCurrViewId    = m_pcSlice->getViewIndex (); 
     Int iCurrRefViewId = m_pcSlice->getRefPic(eRefPicList, riRefIdx)->getViewIndex (); 
     Int iColViewId     = pColCU->getSlice()->getViewIndex(); 
     Int iColRefViewId  = pColCU->getSlice()->getRefPic( eColRefPicList, pColCU->getCUMvField(eColRefPicList)->getRefIdx(uiAbsPartAddr))->getViewIndex(); 
+#else
+    Int iCurrViewId    = m_pcSlice->getViewId (); 
+    Int iCurrRefViewId = m_pcSlice->getRefPic(eRefPicList, riRefIdx)->getViewId (); 
+    Int iColViewId     = pColCU->getSlice()->getViewId(); 
+    Int iColRefViewId  = pColCU->getSlice()->getRefPic( eColRefPicList, pColCU->getCUMvField(eColRefPicList)->getRefIdx(uiAbsPartAddr))->getViewId(); 
+#endif
 #if H_3D_TMVP_SCALING_FIX_K0053
     iScale = 4096;

branches/HTM-13.1-dev0/source/Lib/TLibCommon/TypeDef.h

@@ -339 +339 @@
 #define H_3D_TMVP_FIX_TICKET_97                1
 #define H_3D_DIRECT_DEP_TYPE                   1
+#define H_3D_FIX_TMVP_SCALING_VIEW_ID          1
 #endif
 #define H_MV_FIX_REF_LAYER_PIC_FLAG            1