Changeset 1131 in 3DVCSoftware for branches/HTM-13.0-dev0/source/Lib/TLibEncoder/TEncCfg.h

Timestamp:

18 Feb 2015, 17:39:40 (10 years ago)

Author:

tech

Message:

Cleanup.

File:

• branches/HTM-13.0-dev0/source/Lib/TLibEncoder/TEncCfg.h (modified) (6 diffs)

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

@@ -392 +392 @@
   Double    m_dDispCoeff;
 #endif
-#if !HHI_TOOL_PARAMETERS_I2_J0107
-#if H_3D_ARP
-  UInt      m_uiUseAdvResPred;
-  UInt      m_uiARPStepNum;
-#endif
-#if H_3D_SPIVMP
-  Int      m_iSubPULog2Size;
-  Int      m_iSubPUMPILog2Size;
-#endif
-#endif
 #if H_3D_IC
   Bool      m_bUseIC;
   Bool      m_bUseICLowLatencyEnc;
 #endif
-#if !HHI_TOOL_PARAMETERS_I2_J0107
-#if H_3D_INTER_SDC
-  bool      m_bInterSDC;
-#endif
-#if H_3D_DBBP
-  Bool      m_bUseDBBP;
-#endif
-#endif
   //====== Depth Intra Modes ======
 #if H_3D_DIM
   Bool      m_useDMM;
-#if !HHI_TOOL_PARAMETERS_I2_J0107
-  Bool      m_useIVP;
-#endif
   Bool      m_useSDC;
   Bool      m_useDLT;
-#endif
-#if !HHI_TOOL_PARAMETERS_I2_J0107
-#if H_3D_SINGLE_DEPTH
-  Bool      m_useSingleDepthMode;
-#endif
-
-#if H_3D_IV_MERGE
-  Bool      m_useMPI;
-#endif
 #endif
 #if H_3D_QTLPC
@@ -506 +476 @@
   Void      setMaxTempLayer                 ( Int maxTempLayer )            { m_maxTempLayer = maxTempLayer;      }
 
-#if !HHI_TOOL_PARAMETERS_I2_J0107
-#if H_3D_ARP
-  UInt       getUseAdvRP                    ( )              { return m_uiUseAdvResPred; }
-  Void       setUseAdvRP                    ( UInt  u )      { m_uiUseAdvResPred = u;    }
-
-  UInt       getARPStepNum                  ()               { return m_uiARPStepNum;    }
-  Void       setARPStepNum                  ( UInt  u )      { m_uiARPStepNum = u;       }
-#endif
-#if H_3D_SPIVMP
-  Int        getSubPULog2Size                   ()                   { return m_iSubPULog2Size;}
-  Void       setSubPULog2Size                   (Int u)              { m_iSubPULog2Size = u; }     
-  Int        getSubPUMPILog2Size            ()               { return m_iSubPUMPILog2Size;}
-  Void       setSubPUMPILog2Size            (Int u)          { m_iSubPUMPILog2Size = u;   }     
-#endif
-#endif
 #if H_3D_IC
   Void       setUseIC                       ( Bool bVal )    { m_bUseIC = bVal; }
@@ -526 +481 @@
   Void       setUseICLowLatencyEnc          ( Bool bVal )    { m_bUseICLowLatencyEnc = bVal; }
   Bool       getUseICLowLatencyEnc          ()               { return m_bUseICLowLatencyEnc; }
-#endif
-#if !HHI_TOOL_PARAMETERS_I2_J0107
-#if H_3D_INTER_SDC
-  Void       setInterSDCEnable              ( Bool bVal )    { m_bInterSDC = bVal; }
-  Bool       getInterSDCEnable              ()               { return m_bInterSDC; }
-#endif
-#if H_3D_DBBP
-  Void       setUseDBBP                     ( Bool  b )      { m_bUseDBBP   = b; }
-  Bool       getUseDBBP()                                    { return m_bUseDBBP;     }
-#endif
 #endif
   //======== Transform =============
@@ -991 +936 @@
   Bool      getUseDMM                       ()        { return m_useDMM; }
   Void      setUseDMM                       ( Bool b) { m_useDMM = b;    }
-#if !HHI_TOOL_PARAMETERS_I2_J0107
-  Bool      getUseIVP                       ()        { return m_useIVP; }
-  Void      setUseIVP                       ( Bool b) { m_useIVP = b;    }
-#endif
   Bool      getUseSDC                       ()        { return m_useSDC; }
   Void      setUseSDC                       ( Bool b) { m_useSDC = b;    }
@@ -1000 +941 @@
   Bool      getUseDLT                       ()        { return m_useDLT; }
   Void      setUseDLT                       ( Bool b) { m_useDLT = b;    }
-#endif
-#if !HHI_TOOL_PARAMETERS_I2_J0107
-#if H_3D_SINGLE_DEPTH
-  Void       setUseSingleDepthMode          ( Bool bVal )    { m_useSingleDepthMode = bVal; }
-  Bool       getUseSingleDepthMode          ()               { return m_useSingleDepthMode; }
-#endif
 #endif
 #if H_3D_QTLPC
@@ -1011 +946 @@
   Bool      getUseQTL                       ()         { return m_bUseQTL; }
 #endif
-#if !HHI_TOOL_PARAMETERS_I2_J0107
-#if H_3D_IV_MERGE
-  Void      setUseMPI                       ( Bool b ) { m_useMPI = b;    }
-  Bool      getUseMPI                       ()         { return m_useMPI; }
-#endif
-#endif
 #endif // H_3D
 };