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

Timestamp:

15 Jul 2015, 13:49:16 (9 years ago)

Author:

tech

Message:

-Further fixes.

Location:

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

Files:

• TLibCommon/TComRom.cpp (modified) (1 diff)
• TLibCommon/TComRom.h (modified) (1 diff)
• TLibDecoder/TDecSlice.cpp (modified) (1 diff)
• TLibEncoder/TEncSlice.cpp (modified) (1 diff)

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

@@ -738 +738 @@
   }
 }
-Int incSymbolCounter( )
+UInt64 incSymbolCounter( )
 {
   g_nSymbolCounter++;  

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

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

branches/HTM-14.1-update-dev2/source/Lib/TLibDecoder/TDecSlice.cpp

@@ -91 +91 @@
 #endif
 #if H_MV_ENC_DEC_TRAC
+#if ENC_DEC_TRACE
   incSymbolCounter(); 
+#endif
   DTRACE_CABAC_VL( g_nSymbolCounter );
 #else

branches/HTM-14.1-update-dev2/source/Lib/TLibEncoder/TEncSlice.cpp

@@ -1122 +1122 @@
 #endif
 #if H_MV_ENC_DEC_TRAC
+#if ENC_DEC_TRACE
   incSymbolCounter();
+#endif
   DTRACE_CABAC_VL( g_nSymbolCounter );
 #else