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

Timestamp:

9 Nov 2015, 21:13:05 (8 years ago)

Author:

tech

Message:

Macro cleanups.

File:

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

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

@@ -221 +221 @@
   }
 #if NH_MV
-#if H_MV_HLS_PTL_LIMITS 
+#if NH_MV_HLS_PTL_LIMITS 
  g_generalTierAndLevelLimits[ Level::LEVEL1   ] = TComGeneralTierAndLevelLimits(    36864,     350,  MIN_INT,   16,   1,   1 );
  g_generalTierAndLevelLimits[ Level::LEVEL2   ] = TComGeneralTierAndLevelLimits(   122880,    1500,  MIN_INT,   16,   1,   1 );
@@ -540 +540 @@
 Bool   g_bJustDoIt = false;
 UInt64 g_nSymbolCounter = 0;
-#if H_MV_ENC_DEC_TRAC
+#if NH_MV_ENC_DEC_TRAC
 Bool g_traceCU = false; 
 Bool g_tracePU = false; 
@@ -671 +671 @@
 const UInt g_scalingListSize   [SCALING_LIST_SIZE_NUM] = {16,64,256,1024};
 const UInt g_scalingListSizeX  [SCALING_LIST_SIZE_NUM] = { 4, 8, 16,  32};
-#if H_MV_ENC_DEC_TRAC
+#if NH_MV_ENC_DEC_TRAC
 #if ENC_DEC_TRACE
 Void tracePSHeader( const TChar* psName, Int layerId )