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

Timestamp:

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

Author:

tech

Message:

Macro cleanups.

File:

• branches/HTM-15.2-dev/source/Lib/TLibEncoder/TEncEntropy.cpp (modified) (5 diffs)

branches/HTM-15.2-dev/source/Lib/TLibEncoder/TEncEntropy.cpp

@@ -281 +281 @@
   const UInt uiTrIdx = rTu.GetTransformDepthRel();
   const UInt uiDepth = rTu.GetTransformDepthTotal();
-#if H_MV_ENC_DEC_TRAC
+#if NH_MV_ENC_DEC_TRAC
 #if ENC_DEC_TRACE
   UInt uiLPelX   = pcCU->getCUPelX() + g_auiRasterToPelX[ g_auiZscanToRaster[uiAbsPartIdx] ];
@@ -388 +388 @@
   else
   {
-#if !H_MV_ENC_DEC_TRAC
+#if !NH_MV_ENC_DEC_TRAC
     {
       DTRACE_CABAC_VL( g_nSymbolCounter++ );
@@ -557 +557 @@
   for ( UInt uiPartIdx = 0, uiSubPartIdx = uiAbsPartIdx; uiPartIdx < uiNumPU; uiPartIdx++, uiSubPartIdx += uiPUOffset )
   {
-#if H_MV_ENC_DEC_TRAC
+#if NH_MV_ENC_DEC_TRAC
     DTRACE_PU_S("=========== prediction_unit ===========\n")
        //Todo: 
@@ -795 +795 @@
 Void TEncEntropy::encodeCoeffNxN( TComTU &rTu, TCoeff* pcCoef, const ComponentID compID)
 {
-#if ENC_DEC_TRACE && H_MV_ENC_DEC_TRAC
+#if ENC_DEC_TRACE && NH_MV_ENC_DEC_TRAC
   Bool oldTraceFracBits = g_traceEncFracBits; 
   g_traceEncFracBits = false; 
@@ -827 +827 @@
     }
   }
-#if ENC_DEC_TRACE && H_MV_ENC_DEC_TRAC
+#if ENC_DEC_TRACE && NH_MV_ENC_DEC_TRAC
   g_traceEncFracBits = oldTraceFracBits; 
 #endif