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

Timestamp:

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

Author:

tech

Message:

Removed old macro switches.

Location:

branches/HTM-4.1-dev0/source/App

Files:

• TAppDecoder/TAppDecTop.cpp (modified) (2 diffs)
• TAppEncoder/TAppEncCfg.cpp (modified) (5 diffs)
• TAppEncoder/TAppEncTop.cpp (modified) (4 diffs)
• TAppEncoder/TAppEncTop.h (modified) (1 diff)
• TAppRenderer/TAppRendererTop.cpp (modified) (2 diffs)

branches/HTM-4.1-dev0/source/App/TAppDecoder/TAppDecTop.cpp

@@ -436 +436 @@
     m_useDepth = true;
 
-#if FIX_DECODING_WO_WRITING
   if ( m_pchReconFile )
   { 
-#endif
     while( m_tVideoIOYuvReconFile.size() < newNumberOfViewDepth)
     {
@@ -473 +471 @@
       free ( nextFilename );
     }
-#if FIX_DECODING_WO_WRITING
-  }
-#endif
+  }
 
   while( m_pocLastDisplay.size() < newNumberOfViewDepth )

branches/HTM-4.1-dev0/source/App/TAppEncoder/TAppEncCfg.cpp

@@ -74 +74 @@
 {
   m_aidQP = NULL;
-#if FIXES
   m_aidQPdepth = NULL;
-#endif
 }
 
@@ -86 +84 @@
   }
 
-#if FIXES
   if ( m_aidQPdepth )
   {
     delete[] m_aidQPdepth; m_aidQPdepth = NULL;
   }
-#endif
 
   for(Int i = 0; i< m_pchInputFileList.size(); i++ )
@@ -120 +116 @@
 #endif
 
-#if FIX_MEM_LEAKS
  if ( m_pchCameraParameterFile != NULL )
    free ( m_pchCameraParameterFile ); 
@@ -139 +134 @@
    free ( m_scalingListFile );
 
-#endif   
 
 }
@@ -330 +324 @@
 #endif
 #if DBL_CONTROL
-#if FIX_DBL_CONTROL_DEFAULT
   ("DeblockingFilterControlPresent", m_DeblockingFilterControlPresent, true)
-#else
-  ("DeblockingFilterControlPresent", m_DeblockingFilterControlPresent, false)
-#endif
 #endif
 

branches/HTM-4.1-dev0/source/App/TAppEncoder/TAppEncTop.cpp

@@ -689 +689 @@
     if ( m_uiVSOMode == 4 )
     {
-#if HHI_VSO_SPEEDUP_A0033
 #if LGE_VSO_EARLY_SKIP_A0093
       m_cRendererModel.create( m_cRenModStrParser.getNumOfBaseViews(), m_cRenModStrParser.getNumOfModels(), m_iSourceWidth, g_uiMaxCUHeight , LOG2_DISP_PREC_LUT, 0, m_bVSOEarlySkip );
 #else
       m_cRendererModel.create( m_cRenModStrParser.getNumOfBaseViews(), m_cRenModStrParser.getNumOfModels(), m_iSourceWidth, g_uiMaxCUHeight , LOG2_DISP_PREC_LUT, 0 );
-#endif
-#else
-      m_cRendererModel.create( m_cRenModStrParser.getNumOfBaseViews(), m_cRenModStrParser.getNumOfModels(), m_iSourceWidth, m_iSourceHeight, LOG2_DISP_PREC_LUT, 0 );
 #endif
 
@@ -1027 +1023 @@
   pcDepthPicYuvOrg = NULL;
   
-#if FIX_MEM_LEAKS
   if ( pcPdmDepthOrg != NULL )
   {
@@ -1034 +1029 @@
     pcPdmDepthOrg = NULL; 
   };
-#endif
 
   
@@ -1293 +1287 @@
 #endif
 #if HHI_VSO
-#if HHI_VSO_SPEEDUP_A0033
 Void TAppEncTop::setupRenModel( Int iPoc, Int iEncViewIdx, Int iEncContent, Int iHorOffset )
 {
-#if FIX_VSO_SETUP
   m_cRendererModel.setupPart( iHorOffset, Min( g_uiMaxCUHeight, m_iSourceHeight - iHorOffset ) ); 
-#else
-  m_cRendererModel.setHorOffset( iHorOffset ); 
-#endif
-#else
-Void TAppEncTop::setupRenModel( Int iPoc, Int iEncViewIdx, Int iEncContent )
-{
-#endif
   Int iEncViewSIdx = m_cCameraData.getBaseId2SortedId()[ iEncViewIdx ];
 

branches/HTM-4.1-dev0/source/App/TAppEncoder/TAppEncTop.h

@@ -136 +136 @@
 #endif
 #if HHI_VSO
-#if HHI_VSO_SPEEDUP_A0033
   Void                  setupRenModel    ( Int iPoc, Int iEncViewIdx, Int iEncContent, Int iHorOffset );
-#else
-  Void                  setupRenModel    ( Int iPoc, Int iEncViewIdx, Int iEncContent );
-#endif
 #endif
   

branches/HTM-4.1-dev0/source/App/TAppRenderer/TAppRendererTop.cpp

@@ -532 +532 @@
 #endif
 
-#if HHI_VSO_SPEEDUP_A0033
-#if FIX_VSO_SETUP
     cCurModel.setupPart( 0, m_iSourceHeight  ); 
-#else
-    cCurModel.setHorOffset( 0 );
-#endif
-#endif
 
     for ( Int iViewIdx = 0; iViewIdx < m_iNumberOfInputViews; iViewIdx++ )
@@ -713 +707 @@
 
   AOT( m_iLog2SamplingFactor != 0 );
-#if HHI_VSO_SPEEDUP_A0033
-#if FIX_VSO_SETUP
   cCurModel.setupPart( 0, m_iSourceHeight  ); 
-#else
-  cCurModel.setHorOffset( 0 );
-#endif
-#endif
 #if LGE_VSO_EARLY_SKIP_A0093
   cCurModel.create( m_iNumberOfInputViews, m_iNumberOfOutputViews, m_iSourceWidth, m_iSourceHeight, m_iShiftPrecision, m_iBlendHoleMargin, false );