Changeset 1281 in 3DVCSoftware for branches/HTM-14.1-update-dev2

Timestamp:

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

Author:

tech

Message:

Modified pruning fix.

Location:

branches/HTM-14.1-update-dev2/source/Lib/TLibCommon

Files:

• TComDataCU.cpp (modified) (3 diffs)
• TComRom.cpp (modified) (2 diffs)
• TComRom.h (modified) (1 diff)
• TypeDef.h (modified) (1 diff)

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]  ) &&

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

@@ -555 +555 @@
 const Bool g_bEncDecTraceEnable  = true;
 const Bool g_bEncDecTraceDisable = false;
-Bool   g_HLSTraceEnable = true;
+Bool   g_HLSTraceEnable = false;
 Bool   g_bJustDoIt = false;
 UInt64 g_nSymbolCounter = 0;
 #if H_MV_ENC_DEC_TRAC
-Bool g_traceCU = true; 
-Bool g_tracePU = true; 
-Bool g_traceTU = true; 
+Bool g_traceCU = false; 
+Bool g_tracePU = false; 
+Bool g_traceTU = false; 
 Bool g_disableNumbering = false; 
 Bool g_disableHLSTrace = false; 
@@ -569 +569 @@
 Bool g_decTraceMvFromMerge   = false; 
 Bool g_decTracePicOutput     = false; 
-Bool g_stopAtPos             = true; 
+Bool g_stopAtPos             = false; 
 Bool g_outputPos             = false;   
 Bool g_traceCameraParameters = false; 

branches/HTM-14.1-update-dev2/source/Lib/TLibCommon/TComRom.h

@@ -158 +158 @@
 // Change later
 #ifndef ENC_DEC_TRACE
-#define ENC_DEC_TRACE 1
+#define ENC_DEC_TRACE 0
 #endif
 #endif

branches/HTM-14.1-update-dev2/source/Lib/TLibCommon/TypeDef.h

@@ -96 +96 @@
 #define NH_3D_NBDV_REF                    1
 #define NH_3D_MLC                         1
+#define NH_3D_FIX_PRUNING                 1
 #define NH_3D_VSP                         1
 #define NH_3D_IV_MERGE                    1