Changeset 593 in 3DVCSoftware for branches/HTM-DEV-2.0-dev1-Fix/source/Lib/TLibCommon/TComDataCU.cpp

Timestamp:

27 Aug 2013, 05:27:40 (11 years ago)

Author:

zhang

Message:

fixes of BVSP and VSO related issues, encapsulated by H_3D_FIX

File:

• branches/HTM-DEV-2.0-dev1-Fix/source/Lib/TLibCommon/TComDataCU.cpp (modified) (3 diffs)

branches/HTM-DEV-2.0-dev1-Fix/source/Lib/TLibCommon/TComDataCU.cpp

@@ -3027 +3027 @@
 #endif
         iRefListIdY = 1 - iRefListIdX;
+#if H_3D_BVSP_FIX
+        pcMvFieldNeighbours[(iCount<<1)+iRefListIdX].setMvField( pDInfo->m_acNBDV, i );
+#else
         pcMvFieldNeighbours[(iCount<<1)+iRefListIdX].setMvField( pDInfo->m_acDoNBDV, i );
+#endif
 #if H_3D_NBDV
         pcMvFieldNeighbours[(iCount<<1)+iRefListIdX].getMv().setIDVFlag (false);
@@ -3047 +3051 @@
         predFlag[iRefListIdY] = 1;
 #if MTK_VSP_FIX_E0172
+#if H_3D_BVSP_FIX
+        TComMv  cMv = pDInfo->m_acNBDV;
+#else
         TComMv  cMv = pDInfo->m_acDoNBDV;
+#endif
         otherViewId = m_pcSlice->getRefPic( eRefPicList, i)->getViewId();
         Int iScale = xGetDistScaleFactor( currViewId, otherViewId, currViewId, derivedViewId );
@@ -3062 +3070 @@
         pcMvFieldNeighbours[(iCount<<1)+iRefListIdY].setMvField( cMv, i );
 #else
+#if H_3D_BVSP_FIX
+        pcMvFieldNeighbours[(iCount<<1)+iRefListIdY].setMvField( pDInfo->m_acNBDV, i );
+#else
         pcMvFieldNeighbours[(iCount<<1)+iRefListIdY].setMvField( pDInfo->m_acDoNBDV, i );
+#endif
 #endif
 #if H_3D_NBDV