Changeset 1282 in 3DVCSoftware for branches/HTM-14.1-update-dev1/source/Lib/TLibCommon

Timestamp:

18 Jul 2015, 09:07:20 (10 years ago)

Author:

tech

Message:

Fixed pruning.

Location:

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

Files:

• Debug.cpp (modified) (1 diff)
• 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-dev1/source/Lib/TLibCommon/Debug.cpp

@@ -154 +154 @@
 
 #if DEBUG_STRING
-EnvVar DebugOptionList::DebugString_Structure ("DEBUG_STRUCTURE",   "0", "Produce output on chosen structure                        bit0=intra, bit1=inter");
-EnvVar DebugOptionList::DebugString_Pred      ("DEBUG_PRED",        "0", "Produce output on prediction data.                        bit0=intra, bit1=inter");
-EnvVar DebugOptionList::DebugString_Resi      ("DEBUG_RESI",        "0", "Produce output on residual data.                          bit0=intra, bit1=inter");
-EnvVar DebugOptionList::DebugString_Reco      ("DEBUG_RECO",        "0", "Produce output on reconstructed data.                     bit0=intra, bit1=inter");
+EnvVar DebugOptionList::DebugString_Structure ("DEBUG_STRUCTURE",   "3", "Produce output on chosen structure                        bit0=intra, bit1=inter");
+EnvVar DebugOptionList::DebugString_Pred      ("DEBUG_PRED",        "3", "Produce output on prediction data.                        bit0=intra, bit1=inter");
+EnvVar DebugOptionList::DebugString_Resi      ("DEBUG_RESI",        "3", "Produce output on residual data.                          bit0=intra, bit1=inter");
+EnvVar DebugOptionList::DebugString_Reco      ("DEBUG_RECO",        "3", "Produce output on reconstructed data.                     bit0=intra, bit1=inter");
 EnvVar DebugOptionList::DebugString_InvTran   ("DEBUG_INV_QT",      "0", "Produce output on inverse-quantiser and transform stages. bit0=intra, bit1=inter");
 #endif

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

@@ -3565 +3565 @@
           continue;
         }
+#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]  ) &&
+            ( ( 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;
@@ -3574 +3581 @@
     if (bIsDepth)
     {
+#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]  ) &&
+        ( ( 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;
@@ -3670 +3684 @@
         continue;
       }
+#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]  ) &&
+        ( ( 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;

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

@@ -537 +537 @@
 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;
@@ -686 +686 @@
   }
   Bool stopFlag = false; 
-  if ( g_stopAtPos && poc == 16 && layerId == 1 )
+  if ( g_stopAtPos && poc == 6 && layerId == 2 )
   {
     Bool stopAtCU = true; 
     if ( stopAtCU )        // Stop at CU with specific size
     {    
-      stopFlag = ( cuPelX  == 0 ) && ( cuPelY  == 0 ) && ( cuWidth == 32 ) && ( cuHeight == 32 ); 
+      stopFlag = ( cuPelX  == 128 ) && ( cuPelY  == 160 ) && ( cuWidth == 32 ) && ( cuHeight == 32 ); 
     }
     else

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

@@ -196 +196 @@
  Void           writeToTraceFile( const Char* symbolName, Int val, Bool doIt );
  Void           writeToTraceFile( const Char* symbolName, Bool doIt );
- incSymbolCounter incSymbolCounter();          
+ UInt64         incSymbolCounter();          
  Void           stopAtPos       ( Int poc, Int layerId, Int cuPelX, Int cuPelY, Int cuWidth, Int cuHeight );           
 #endif

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

@@ -97 +97 @@
 #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