Changeset 1313 in 3DVCSoftware for trunk/source/App/TAppEncoder/TAppEncTop.h

Timestamp:

13 Aug 2015, 17:38:13 (9 years ago)

Author:

tech

Message:

Merged 14.1-update-dev1@1312.

File:

• trunk/source/App/TAppEncoder/TAppEncTop.h (modified) (9 diffs)

trunk/source/App/TAppEncoder/TAppEncTop.h

@@ -2 +2 @@
  * License, included below. This software may be subject to other third party
  * and contributor rights, including patent rights, and no such rights are
- * granted under this license.  
+ * granted under this license.
  *
-* Copyright (c) 2010-2015, ITU/ISO/IEC
+ * Copyright (c) 2010-2015, ITU/ISO/IEC
  * All rights reserved.
  *
@@ -46 +46 @@
 #include "TLibCommon/AccessUnit.h"
 #include "TAppEncCfg.h"
-#if H_3D
+#if NH_3D
 #include "../../Lib/TLibRenderer/TRenTop.h"
 #endif
@@ -65 +65 @@
 private:
   // class interface
-#if H_MV
+#if NH_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<TComList<TComPicYuv*>*>  m_cListPicYuvRec;         ///< list of reconstruction YUV files
 
   std::vector<Int>           m_frameRcvd;                   ///< number of received frames 
 
   TComPicLists               m_ivPicLists;                  ///< picture buffers of encoder instances
-#if H_MV
+#if NH_MV
   TComVPS*                   m_vps;                         ///< vps
 #else
@@ -84 +84 @@
   TVideoIOYuv                m_cTVideoIOYuvInputFile;       ///< input YUV file
   TVideoIOYuv                m_cTVideoIOYuvReconFile;       ///< output reconstruction file
-  
+
   TComList<TComPicYuv*>      m_cListPicYuvRec;              ///< list of reconstruction YUV files
-  
+
   Int                        m_iFrameRcvd;                  ///< number of received frames
 #endif
 
-#if H_3D
-  TComDLT                    m_dlt;                         ///< dlt
+#if NH_3D
   TComSps3dExtension         m_sps3dExtension;              ///< Currently all layers share the same sps 3D Extension  
 #endif
@@ -97 +96 @@
   UInt m_essentialBytes;
   UInt m_totalBytes;
-#if H_3D_VSO
+#if NH_3D_VSO
   TRenTop                     m_cRendererTop; 
   TRenModel                   m_cRendererModel;   
@@ -107 +106 @@
   Void  xInitLib          (Bool isFieldCoding);             ///< initialize encoder class
   Void  xDestroyLib       ();                               ///< destroy encoder class
-  
+
   /// obtain required buffers
-#if H_MV
+#if NH_MV
   Void  xGetBuffer(TComPicYuv*& rpcPicYuvRec, UInt layer);
 #else
@@ -117 +116 @@
   /// delete allocated buffers
   Void  xDeleteBuffer     ();
-  
+
   // file I/O
-#if H_MV
+#if NH_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();
+  Void rateStatsAccum(const AccessUnit& au, const std::vector<UInt>& stats);
+  Void printRateSummary();
+  Void printChromaFormat();
 
-#if H_MV
+#if NH_MV
+  Void xSetTimingInfo             ( TComVPS& vps );
+  Void xSetHrdParameters          ( TComVPS& vps );
   Void xSetLayerIds               ( TComVPS& vps );  
   Void xSetDimensionIdAndLength   ( TComVPS& vps );
@@ -134 +136 @@
   Void xSetProfileTierLevel       ( TComVPS& vps );
 
-  Void xSetProfileTierLevel( TComVPS& vps, Int profileTierLevelIdx, Int subLayer,                              
-                             Profile::Name profile, Level::Name level, Level::Tier tier, 
-                             Bool progressiveSourceFlag, Bool interlacedSourceFlag, 
-                             Bool nonPackedConstraintFlag, Bool frameOnlyConstraintFlag, 
-                             Bool inbldFlag );
+  Void xSetProfileTierLevel       ( TComVPS& vps, Int profileTierLevelIdx, Int subLayer,                              
+                                    Profile::Name profile, Level::Name level, Level::Tier tier, 
+                                    Bool progressiveSourceFlag, Bool interlacedSourceFlag, 
+                                    Bool nonPackedConstraintFlag, Bool frameOnlyConstraintFlag, 
+                                    Bool inbldFlag );
   Void xSetRepFormat              ( TComVPS& vps );
   Void xSetDpbSize                ( TComVPS& vps );
   Void xSetVPSVUI                 ( TComVPS& vps );
-#if H_3D
+#if NH_3D
   Void xSetCamPara                ( TComVPS& vps );
 #endif
@@ -149 +151 @@
   Bool xLayerIdInTargetEncLayerIdList( Int nuhLayerId );
 #endif
-#if H_3D
-  Void xDeriveDltArray( TComVPS& vps, TComDLT& dlt );
+#if NH_3D_DLT
+  Void xDeriveDltArray( TComVPS& vps, TComDLT* dlt );
+  Void xAnalyzeInputBaseDepth(UInt layer, UInt uiNumFrames, TComVPS* vps, TComDLT* dlt);
 #endif
-#if H_3D_DIM_DLT
-  Void  xAnalyzeInputBaseDepth(UInt layer, UInt uiNumFrames, TComVPS* vps, TComDLT* dlt);
-#endif
+
 public:
   TAppEncTop();
   virtual ~TAppEncTop();
-  
+
   Void        encode      ();                               ///< main encoding function
-#if H_MV
+#if NH_MV
   TEncTop*    getTEncTop( UInt layer ) { return  m_acTEncTopList[layer]; }  ///< return pointer to encoder class for specific layer
 #else