Changeset 367 in 3DVCSoftware for branches/HTM-DEV-0.1-dev/source/Lib/TLibEncoder/TEncTop.h

Timestamp:

3 May 2013, 17:09:57 (12 years ago)

Author:

tech

Message:

Further minor cleanups.

File:

• branches/HTM-DEV-0.1-dev/source/Lib/TLibEncoder/TEncTop.h (modified) (5 diffs)

branches/HTM-DEV-0.1-dev/source/Lib/TLibEncoder/TEncTop.h

@@ -74 +74 @@
   TComList<TComPic*>      m_cListPic;                     ///< dynamic list of pictures
   
-#if H_MV
-  TComPicLists*           m_ivPicLists;                   ///< access to picture lists of other layers 
-#endif
   // encoder search
   TEncSearch              m_cSearch;                      ///< encoder search class
@@ -125 +122 @@
   TEncRateCtrl            m_cRateCtrl;                    ///< Rate control class
   
-#if H_MV
-  TEncAnalyze             m_cAnalyzeAll;
-  TEncAnalyze             m_cAnalyzeI;
-  TEncAnalyze             m_cAnalyzeP;
-  TEncAnalyze             m_cAnalyzeB;  
-#endif
 protected:
   Void  xGetNewPicBuffer  ( TComPic*& rpcPic );           ///< get picture buffer which will be processed
@@ -146 +137 @@
   Void      destroy         ();
   Void      init            ();
-#if H_MV  
-  TComPicLists* getIvPicLists() { return m_ivPicLists; }
-#endif
   Void      deletePicBuffer ();
 
   Void      createWPPCoders(Int iNumSubstreams);
   
-#if H_MV
-  Void      initNewPic(TComPicYuv* pcPicYuvOrg);
-#endif
   // -------------------------------------------------------------------------------------------------------------------
   // member access functions
@@ -192 +177 @@
 #endif
   TComScalingList*        getScalingList        () { return  &m_scalingList;         }
-#if H_MV
-  TEncAnalyze*            getAnalyzeAll         () { return &m_cAnalyzeAll; }
-  TEncAnalyze*            getAnalyzeI           () { return &m_cAnalyzeI;   }
-  TEncAnalyze*            getAnalyzeP           () { return &m_cAnalyzeP;   }
-  TEncAnalyze*            getAnalyzeB           () { return &m_cAnalyzeB;   }
-
-  Int                     getNumAllPicCoded     () { return m_uiNumAllPicCoded; }
- 
-  Int                     getFrameId            (Int iGOPid);
-  
-  TComPic*                getPic                ( Int poc );
-  Void                    setIvPicLists         ( TComPicLists* picLists) { m_ivPicLists = picLists; }
-#endif
   // -------------------------------------------------------------------------------------------------------------------
   // encoder function
@@ -210 +182 @@
 
   /// encode several number of pictures until end-of-sequence
-#if H_MV
-  Void encode( Bool bEos, TComPicYuv* pcPicYuvOrg, TComList<TComPicYuv*>& rcListPicYuvRecOut, std::list<AccessUnit>& accessUnitsOut, Int& iNumEncoded  , Int gopId  );  
-#else
   Void encode( Bool bEos, TComPicYuv* pcPicYuvOrg, TComList<TComPicYuv*>& rcListPicYuvRecOut,
               std::list<AccessUnit>& accessUnitsOut, Int& iNumEncoded );  
-#endif
 
-#if H_MV
-  Void printSummary      ( Int numAllPicCoded ); 
-#else
   void printSummary() { m_cGOPEncoder.printOutSummary (m_uiNumAllPicCoded); }
-#endif
 };