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

branches/HTM-DEV-0.3-dev2/source/App/TAppEncoder/TAppEncTop.h

@@ -48 +48 @@
 #if H_3D
 #include "../../Lib/TLibRenderer/TRenTop.h"
-#if H_3D_IV_MERGE
-#include "TLibCommon/TComDepthMapGenerator.h"
-#endif
 #endif
 
@@ -92 +89 @@
   TRenModel                   m_cRendererModel;   
 #endif
-#if H_3D_IV_MERGE
-  TComVPSAccess               m_cVPSAccess;
-  TComSPSAccess               m_cSPSAccess;
-  TComAUPicAccess             m_cAUPicAccess;
-#endif
 protected:
   // initialization
@@ -122 +114 @@
   void rateStatsAccum(const AccessUnit& au, const std::vector<UInt>& stats);
   void printRateSummary();
-#if H_3D_IV_MERGE
-  TComPic* xGetPicFromView( Int viewIdx, Int iPoc, Bool isDepth );
-#endif
+
 #if H_MV
   Void xSetLayerIds               ( TComVPS& vps );  
@@ -131 +121 @@
   Int  xGetMax( std::vector<Int>& vec);
 #endif
+#if H_3D_GEN
+  Void xSetVPSExtension2( TComVPS& vps );
+#endif
 public:
   TAppEncTop();
@@ -136 +129 @@
   
   Void        encode      ();                               ///< main encoding function
-#if H_3D_IV_MERGE
-  TComPic*              getPicFromView     ( Int viewIdx, Int poc, Bool isDepth ) { return xGetPicFromView( viewIdx, poc, isDepth ); }
-#endif
 #if H_MV
   TEncTop*    getTEncTop( UInt layer ) { return  m_acTEncTopList[layer]; }  ///< return pointer to encoder class for specific layer
 #else
   TEncTop&    getTEncTop  ()   { return  m_cTEncTop; }      ///< return encoder class pointer reference
-#endif
-#if H_3D_IV_MERGE
-  TComVPSAccess*    getVPSAccess  () { return &m_cVPSAccess;   }
-  TComSPSAccess*    getSPSAccess  () { return &m_cSPSAccess;   }
-  TComAUPicAccess*  getAUPicAccess() { return &m_cAUPicAccess; }
 #endif
 };// END CLASS DEFINITION TAppEncTop