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

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

Location:

branches/HTM-DEV-2.0-dev1-Fix/source/Lib/TLibCommon

Files:

• TComDataCU.cpp (modified) (3 diffs)
• TypeDef.h (modified) (2 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

branches/HTM-DEV-2.0-dev1-Fix/source/Lib/TLibCommon/TypeDef.h

@@ -149 +149 @@
                                               // FIX_SDC_ENC_RD_WVSO_D0163
                                               // MTK_SAMPLE_BASED_SDC_D0110
-
+#define H_3D_FIX                             1
+#if H_3D_FIX
+#define H_3D_BVSP_FIX                        1  //DV from NBDV instead of DoNBDV should be used
+#define FIX036                               1  // fix for ticket #36
+#endif
 #endif 
 
@@ -430 +434 @@
 
 #if H_3D_VSO_DIST_INT
+#if FIX036
+typedef       Int64            Dist;       ///< RDO distortion
+#else
 typedef       Int              Dist;       ///< RDO distortion
+#endif
 typedef       Int64            Dist64; 
 #define       RDO_DIST_MIN     MIN_INT