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

Timestamp:

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

Author:

tech

Message:

Removed old macro switches.

Location:

branches/HTM-4.1-dev0/source/Lib/TLibEncoder

Files:

• TEncCfg.h (modified) (1 diff)
• TEncCu.cpp (modified) (1 diff)
• TEncGOP.cpp (modified) (1 diff)
• TEncGOP.h (modified) (1 diff)
• TEncSbac.cpp (modified) (1 diff)
• TEncSearch.cpp (modified) (2 diffs)
• TEncSlice.cpp (modified) (5 diffs)
• TEncTop.cpp (modified) (3 diffs)

branches/HTM-4.1-dev0/source/Lib/TLibEncoder/TEncCfg.h

@@ -279 +279 @@
   Int       m_iColumnRowInfoPresent;
   Int       m_iUniformSpacingIdr;
-#if FIX_REMOVE_TILE_DEPENDENCE
-#else
-  Int       m_iTileBoundaryIndependenceIdr;
-#endif
   Int       m_iNumColumnsMinus1;
   UInt*     m_puiColumnWidth;

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

@@ -1348 +1348 @@
 
 #if HHI_VSO
-#if HHI_VSO_SET_OPTIM 
-#else 
-          if( m_pcRdCost->getUseRenModel() ) // necessary ??
-          {
-            UInt  uiWidth     = m_ppcRecoYuvBest[uhNextDepth]->getWidth   (  );
-            UInt  uiHeight    = m_ppcRecoYuvBest[uhNextDepth]->getHeight  (   );
-            Pel*  piSrc       = m_ppcRecoYuvBest[uhNextDepth]->getLumaAddr( 0 );
-            UInt  uiSrcStride = m_ppcRecoYuvBest[uhNextDepth]->getStride  (   );
-            m_pcRdCost->setRenModelData( pcSubBestPartCU, 0, piSrc, uiSrcStride, uiWidth, uiHeight );
-          }
-#endif
 #endif
         }

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

@@ -449 +449 @@
 #endif
 
-#if HHI_VSO_SPEEDUP_A0033
-#else
-    if ( iVSOMode == 4 )
-    {
-      m_pcEncTop->getEncTop()->setupRenModel( pcSlice->getPOC(), pcSlice->getViewId(), m_pcEncTop->isDepthCoder() ? 1 : 0 );
-    }
-    else
-    {
-      AOT(true); 
-    }
-#endif
 
 #if SAIT_VSO_EST_A0033

branches/HTM-4.1-dev0/source/Lib/TLibEncoder/TEncGOP.h

@@ -137 +137 @@
   
   Void  preLoopFilterPicAll  ( TComPic* pcPic, UInt64& ruiDist, UInt64& ruiBits );
-#if HHI_VSO_SPEEDUP_A0033
   TEncTop* getEncTop() { return m_pcEncTop; }
-#endif
   
   TEncSlice*  getSliceEncoder()   { return m_pcSliceEncoder; }

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

@@ -307 +307 @@
   }  
 
-  #if CABAC_INIT_FLAG && POZNAN_CABAC_INIT_FLAG_FIX
+  #if CABAC_INIT_FLAG && FIX_POZNAN_CABAC_INIT_FLAG
     m_pcSlice->getPPS()->setEncPrevPOC( m_pcSlice->getPOC() );
   #endif

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

@@ -6513 +6513 @@
         
         Dist uiActDist = RDO_DIST_MAX;
-#if FIX_RDO_MACRO
 #if SAIT_VSO_EST_A0033
         if ( m_pcRdCost->getUseEstimatedVSD() )
@@ -6544 +6543 @@
 #endif // LGE_WVSO_A0119
         }
-#else // FIX_RDO_MACRO
-#if SAIT_VSO_EST_A0033
-        if ( m_pcRdCost->getUseEstimatedVSD() )
-        {          
-          TComPicYuv* pcVirRec = m_pcRdCost->getVideoRecPicYuv();
-          TComPicYuv* pcVirOrg = m_pcRdCost->getDepthPicYuv();
-          uiActDist = m_pcRdCost->getDistPart( piPredic, uiStride, piOrig, uiStride, pcVirRec->getLumaAddr(pcCU->getAddr(),pcCU->getZorderIdxInCU()), pcVirOrg->getLumaAddr(pcCU->getAddr(),pcCU->getZorderIdxInCU()), pcVirRec->getStride(), uiWidth, uiHeight );
-#if LGE_WVSO_A0119
-          if ( m_pcRdCost->getUseWVSO() )
-          {    
-            Int iDWeight = m_pcRdCost->getDWeight() * m_pcRdCost->getDWeight();
-            Int iVSDWeight = m_pcRdCost->getVSDWeight() * m_pcRdCost->getVSDWeight();
-            Dist iD = (Dist) m_pcRdCost->getDistPart( piPredic, uiStride, piOrig, uiStride, uiWidth, uiHeight, false, DF_SAD );
-            uiActDist = (iDWeight * iD + iVSDWeight * (Dist) uiActDist) / ( iDWeight + iVSDWeight);
-          }
-#endif // LGE_WVSO_A0119
-        }
-        else       
-#else  // SAIT_VSO_EST_A0033 <-- wrong #else statement should be #endif
-        {        
-          uiActDist = m_pcRdCost->getDistVS( pcCU, 0, piPredic, uiStride,  piOrig, uiStride, uiWidth, uiHeight, false, 0 );
-#if LGE_WVSO_A0119
-          if ( m_pcRdCost->getUseWVSO() )
-          {    
-            Int iDWeight = m_pcRdCost->getDWeight() * m_pcRdCost->getDWeight();
-            Int iVSOWeight = m_pcRdCost->getVSOWeight() * m_pcRdCost->getVSOWeight();
-            Dist iD = (Dist) m_pcRdCost->getDistPart( piPredic, uiStride, piOrig, uiStride, uiWidth, uiHeight, false, DF_SAD );
-            uiActDist = (iDWeight * iD + iVSOWeight * (Dist) uiActDist) / ( iDWeight + iVSOWeight);
-          }
-#endif // LGE_WVSO_A0119
-        }
-#endif // SAIT_VSO_EST_A0033 <-- wrong #endif should be removed
-#endif // FIX_RDO_MACRO
 
         if( uiActDist < uiBestDist || uiBestDist == RDO_DIST_MAX )

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.

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

@@ -91 +91 @@
 {
   // initialize global variables
-#if FIX_INIT_ROM
   if( m_viewId == 0 && m_isDepth == false )
   {
-#endif
     initROM();
-#if FIX_INIT_ROM
-  }
-#endif
+  }
 
 
@@ -605 +601 @@
   // mark it should be extended
   rpcPic->getPicYuvRec()->setBorderExtension(false);
-#if FIXES
   rpcPic->getPicYuvOrg()->setBorderExtension(false); 
-#endif
 }
 
@@ -1106 +1100 @@
 
     // # substreams is "per tile" when tiles are independent.
-#if FIX_REMOVE_TILE_DEPENDENCE
     if ( m_iWaveFrontSynchro )
-#else
-    if (m_iTileBoundaryIndependenceIdr && m_iWaveFrontSynchro)
-#endif
     {
       m_cPPS.setNumSubstreams(m_iWaveFrontSubstreams * (m_iNumColumnsMinus1+1)*(m_iNumRowsMinus1+1));