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

Timestamp:

18 Jul 2015, 08:48:16 (9 years ago)

Author:

tech

Message:

Modified pruning fix.

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 NH_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]  ) &&
@@ -3686 +3686 @@
     if (bIsDepth)
     {
-#if H_3D_FIX_PRUNING
+#if NH_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]  ) &&
@@ -3789 +3789 @@
         continue;
       }
-#if H_3D_FIX_PRUNING
+#if NH_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]  ) &&