Changeset 188 in 3DVCSoftware for branches/HTM-4.1-dev0/source/Lib/TLibEncoder/TEncSlice.cpp

Timestamp:

15 Nov 2012, 21:36:12 (12 years ago)

Author:

tech

Message:

Removed old macro switches.

File:

• branches/HTM-4.1-dev0/source/Lib/TLibEncoder/TEncSlice.cpp (modified) (5 diffs)

branches/HTM-4.1-dev0/source/Lib/TLibEncoder/TEncSlice.cpp

@@ -38 +38 @@
 #include "TEncTop.h"
 #include "TEncSlice.h"
-#if HHI_VSO_SPEEDUP_A0033
 #include "../../App/TAppEncoder/TAppEncTop.h"
-#endif
 #include <math.h>
 
@@ -659 +657 @@
   m_uiPicDist       = 0;
   
-#if CABAC_INIT_FLAG && POZNAN_CABAC_INIT_FLAG_FIX
+#if CABAC_INIT_FLAG && FIX_POZNAN_CABAC_INIT_FLAG
   Bool bReset =(pcSlice->getPOC() == 0) || 
     (pcSlice->getPOC() % m_pcCfg->getIntraPeriod() == 0) ||
@@ -823 +821 @@
   UInt uiTileLCUX     = 0;
 
-#if HHI_VSO_SPEEDUP_A0033
   Int iLastPosY = -1;
-#endif
 
   // for every CU in slice
@@ -838 +834 @@
     pcCU->initCU( rpcPic, uiCUAddr );
 
-#if HHI_VSO_SPEEDUP_A0033
     if ( m_pcRdCost->getUseRenModel() )
     {
@@ -852 +847 @@
       }
     }    
-#endif
 
     // inherit from TR if necessary, select substream to use.