Changeset 367 in 3DVCSoftware for branches/HTM-DEV-0.1-dev/source/App/TAppEncoder/TAppEncTop.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/App/TAppEncoder/TAppEncTop.h (modified) (5 diffs)

branches/HTM-DEV-0.1-dev/source/App/TAppEncoder/TAppEncTop.h

@@ -59 +59 @@
 private:
   // class interface
-#if H_MV
-  std::vector<TEncTop*>      m_acTEncTopList ;              ///< encoder class per layer 
-  std::vector<TVideoIOYuv*>  m_acTVideoIOYuvInputFileList;  ///< input YUV file
-  std::vector<TVideoIOYuv*>  m_acTVideoIOYuvReconFileList;  ///< output reconstruction file
-  
-  std::vector<TComList<TComPicYuv*>*>  m_picYuvRec;         ///< list of reconstruction YUV files
-
-  std::vector<Int>           m_frameRcvd;                   ///< number of received frames 
-
-  TComPicLists               m_ivPicLists;                  ///< picture buffers of encoder instances
-#else
   TEncTop                    m_cTEncTop;                    ///< encoder class
   TVideoIOYuv                m_cTVideoIOYuvInputFile;       ///< input YUV file
@@ -77 +66 @@
   
   Int                        m_iFrameRcvd;                  ///< number of received frames
-#endif
 
   UInt m_essentialBytes;
@@ -89 +77 @@
   
   /// obtain required buffers
-#if H_MV
-  Void xGetBuffer(TComPicYuv*& rpcPicYuvRec, UInt layer);
-#else
   Void xGetBuffer(TComPicYuv*& rpcPicYuvRec);
-#endif
 
   /// delete allocated buffers
@@ -99 +83 @@
   
   // file I/O
-#if H_MV
-  Void xWriteOutput(std::ostream& bitstreamFile, Int iNumEncoded, std::list<AccessUnit>& accessUnits, UInt layerId); ///< write bitstream to file
-#else
   Void xWriteOutput(std::ostream& bitstreamFile, Int iNumEncoded, const std::list<AccessUnit>& accessUnits); ///< write bitstream to file
-#endif
   void rateStatsAccum(const AccessUnit& au, const std::vector<UInt>& stats);
   void printRateSummary();
   
-#if H_MV
-  Void xSetLayerIds               ( TComVPS& vps );  
-  Void xSetDimensionIdAndLength   ( TComVPS& vps );
-  Void xSetDirectDependencyFlags  ( TComVPS& vps );
-  Int  xGetMax( std::vector<Int>& vec);
-#endif
 public:
   TAppEncTop();
@@ -118 +92 @@
   
   Void        encode      ();                               ///< main encoding function
-#if H_MV
-  TEncTop*    getTEncTopLayer(UInt layer) { return  m_acTEncTopList[layer]; }  ///< return pointer to encoder class for specific layer
-#if H_3D
-  TEncTop*    getTEncTopView( Int viewId, Bool isDepth );                      ///< return pointer to encoder class for specific view Id and texture or depth 
-#endif
-#else
   TEncTop&    getTEncTop  ()   { return  m_cTEncTop; }      ///< return encoder class pointer reference
-#endif
 };// END CLASS DEFINITION TAppEncTop