Changeset 1280 in 3DVCSoftware for branches/HTM-14.1-update-dev2/source/Lib/TLibCommon/TComDataCU.cpp

Timestamp:

17 Jul 2015, 16:59:43 (9 years ago)

Author:

tech

Message:

• Preliminary fix for pruning.

File:

• branches/HTM-14.1-update-dev2/source/Lib/TLibCommon/TComDataCU.cpp (modified) (3 diffs)

branches/HTM-14.1-update-dev2/source/Lib/TLibCommon/TComDataCU.cpp

@@ -3670 +3670 @@
           continue;
         }
+#if H_3D_FIX_PRUNING
+        if  (   ivCandDir[0] == m_mergCands[MRG_A1+i].m_uDir                                &&
+            ( ( ivCandDir[0] & 1 ) == 0 || tmpMV[0]==m_mergCands[MRG_A1+i].m_cMvField[0]  ) &&
+            ( ( ivCandDir[0] & 2 ) == 0 || tmpMV[1]==m_mergCands[MRG_A1+i].m_cMvField[1]  ) 
+           )
+#else
         if (ivCandDir[0] == m_mergCands[MRG_A1+i].m_uDir && tmpMV[0]==m_mergCands[MRG_A1+i].m_cMvField[0] && tmpMV[1]==m_mergCands[MRG_A1+i].m_cMvField[1])
+#endif
         {
           m_mergCands[MRG_A1+i].m_bAvailable = false;
@@ -3679 +3686 @@
     if (bIsDepth)
     {
+#if H_3D_FIX_PRUNING
+      if  ( m_mergCands[MRG_T].m_bAvailable &&   ivCandDir[0] == m_mergCands[MRG_T].m_uDir  &&
+        ( ( ivCandDir[0] & 1 ) == 0 || tmpMV[0]==m_mergCands[MRG_T].m_cMvField[0]  ) &&
+        ( ( ivCandDir[0] & 2 ) == 0 || tmpMV[1]==m_mergCands[MRG_T].m_cMvField[1]  ) 
+        )
+#else
       if (m_mergCands[MRG_T].m_bAvailable && ivCandDir[0] == m_mergCands[MRG_T].m_uDir && tmpMV[0]==m_mergCands[MRG_T].m_cMvField[0] && tmpMV[1]==m_mergCands[MRG_T].m_cMvField[1])
+#endif
       {
         bRemoveSpa                      = true;
@@ -3775 +3789 @@
         continue;
       }
+#if H_3D_FIX_PRUNING
+      if  ( ivCandDir[1] == m_mergCands[MRG_A1+i].m_uDir  &&
+        ( ( ivCandDir[1] & 1 ) == 0 || tmpMV[0]==m_mergCands[MRG_A1+i].m_cMvField[0]  ) &&
+        ( ( ivCandDir[1] & 2 ) == 0 || tmpMV[1]==m_mergCands[MRG_A1+i].m_cMvField[1]  ) 
+        )
+#else
       if (ivCandDir[1] == m_mergCands[MRG_A1+i].m_uDir && tmpMV[0]==m_mergCands[MRG_A1+i].m_cMvField[0] && tmpMV[1]==m_mergCands[MRG_A1+i].m_cMvField[1])
+#endif
       {
         bRemoveSpa                      = true;