Changeset 1360 in 3DVCSoftware for branches/HTM-15.2-dev/source/Lib/TLibCommon/TComRom.cpp

Timestamp:

28 Oct 2015, 17:46:00 (9 years ago)

Author:

tech

Message:

Update to HM-16.7.

File:

• branches/HTM-15.2-dev/source/Lib/TLibCommon/TComRom.cpp (modified) (7 diffs)

branches/HTM-15.2-dev/source/Lib/TLibCommon/TComRom.cpp

@@ -47 +47 @@
 //! \ingroup TLibCommon
 //! \{
-const Char* nalUnitTypeToString(NalUnitType type)
+const TChar* nalUnitTypeToString(NalUnitType type)
 {
   switch (type)
@@ -532 +532 @@
 // Misc.
 // ====================================================================================================================
-Char  g_aucConvertToBit  [ MAX_CU_SIZE+1 ];
+SChar  g_aucConvertToBit  [ MAX_CU_SIZE+1 ];
 #if ENC_DEC_TRACE
 FILE*  g_hTrace = NULL; // Set to NULL to open up a file. Set to stdout to use the current output
 const Bool g_bEncDecTraceEnable  = true;
 const Bool g_bEncDecTraceDisable = false;
-Bool   g_HLSTraceEnable = false;
+Bool   g_HLSTraceEnable = true;
 Bool   g_bJustDoIt = false;
 UInt64 g_nSymbolCounter = 0;
@@ -582 +582 @@
 const UInt g_uiMinInGroup[ LAST_SIGNIFICANT_GROUPS ] = {0,1,2,3,4,6,8,12,16,24};
 const UInt g_uiGroupIdx[ MAX_TU_SIZE ]   = {0,1,2,3,4,4,5,5,6,6,6,6,7,7,7,7,8,8,8,8,8,8,8,8,9,9,9,9,9,9,9,9};
-const Char *MatrixType[SCALING_LIST_SIZE_NUM][SCALING_LIST_NUM] =
+const TChar *MatrixType[SCALING_LIST_SIZE_NUM][SCALING_LIST_NUM] =
 {
   {
@@ -617 +617 @@
   },
 };
-const Char *MatrixType_DC[SCALING_LIST_SIZE_NUM][SCALING_LIST_NUM] =
+const TChar *MatrixType_DC[SCALING_LIST_SIZE_NUM][SCALING_LIST_NUM] =
 {
   {
@@ -673 +673 @@
 #if H_MV_ENC_DEC_TRAC
 #if ENC_DEC_TRACE
-Void tracePSHeader( const Char* psName, Int layerId )
+Void tracePSHeader( const TChar* psName, Int layerId )
 {  
   if ( !g_disableHLSTrace  ) 
@@ -727 +727 @@
   }  
 }
-Void writeToTraceFile( const Char* symbolName, Int val, Bool doIt )
+Void writeToTraceFile( const TChar* symbolName, Int val, Bool doIt )
 {
   if ( ( ( g_nSymbolCounter >= COUNTER_START && g_nSymbolCounter <= COUNTER_END )|| g_bJustDoIt ) && doIt  ) 
@@ -749 +749 @@
   return g_nSymbolCounter; 
 }
-Void writeToTraceFile( const Char* symbolName, Bool doIt )
+Void writeToTraceFile( const TChar* symbolName, Bool doIt )
 {
   if ( ( ( g_nSymbolCounter >= COUNTER_START && g_nSymbolCounter <= COUNTER_END )|| g_bJustDoIt ) && doIt  )