Changeset 479 in 3DVCSoftware for branches/HTM-DEV-0.3-dev2/source/Lib/TLibEncoder/TEncTop.h

Timestamp:

18 Jun 2013, 23:24:53 (11 years ago)

Author:

tech

Message:

• changed IV-MERGE HLS to match Test Model 4 spec
• incorporated iv-refpic list to TComSlice
• removed TComDepthMapGenerator

File:

• branches/HTM-DEV-0.3-dev2/source/Lib/TLibEncoder/TEncTop.h (modified) (7 diffs)

branches/HTM-DEV-0.3-dev2/source/Lib/TLibEncoder/TEncTop.h

@@ -57 +57 @@
 #include "TEncPreanalyzer.h"
 #include "TEncRateCtrl.h"
-#if H_3D_IV_MERGE
-#include "TLibCommon/TComDepthMapGenerator.h"
-#endif
 //! \ingroup TLibEncoder
 //! \{
@@ -67 +64 @@
 // ====================================================================================================================
 
-#if H_3D_IV_MERGE
-class TAppEncTop;
-#endif
 /// encoder class
 class TEncTop : public TEncCfg
@@ -102 +96 @@
   TEncSlice               m_cSliceEncoder;                ///< slice encoder
   TEncCu                  m_cCuEncoder;                   ///< CU encoder
-#if H_3D_IV_MERGE
-  TComDepthMapGenerator   m_cDepthMapGenerator;           ///< depth map generator
-#endif
   // SPS
   TComSPS                 m_cSPS;                         ///< SPS
@@ -128 +119 @@
   TEncBinCABAC*           m_pcRDGoOnBinCodersCABAC;        ///< going on bin coder CABAC for RD stage per substream
 
-#if H_3D_IV_MERGE  
-  TAppEncTop*             m_pcTAppEncTop;
-#endif
   // quality control
   TEncPreanalyzer         m_cPreanalyzer;                 ///< image characteristics analyzer for TM5-step3-like adaptive QP
@@ -157 +145 @@
   Void      create          ();
   Void      destroy         ();
-#if H_3D_IV_MERGE
-  Void      init            ( TAppEncTop* pcTAppEncTop );
-#else
   Void      init            ();
-#endif
 #if H_MV  
   TComPicLists* getIvPicLists() { return m_ivPicLists; }
@@ -201 +185 @@
   TEncSbac*               getRDGoOnSbacCoders   () { return  m_pcRDGoOnSbacCoders;   }
   TEncRateCtrl*           getRateCtrl           () { return &m_cRateCtrl;             }
-#if H_3D_IV_MERGE
-  TAppEncTop*             getEncTop             () { return m_pcTAppEncTop; }
-#endif
   TComSPS*                getSPS                () { return  &m_cSPS;                 }
   TComPPS*                getPPS                () { return  &m_cPPS;                 }
@@ -224 +205 @@
   Void                    setIvPicLists         ( TComPicLists* picLists) { m_ivPicLists = picLists; }
 #endif
-#if H_3D_IV_MERGE
-  TComDepthMapGenerator*  getDepthMapGenerator  () { return  &m_cDepthMapGenerator;   }
-#endif
   // -------------------------------------------------------------------------------------------------------------------
   // encoder function