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

branches/HTM-DEV-0.3-dev2/source/App/TAppDecoder/TAppDecTop.h

@@ -49 +49 @@
 #include "TAppDecCfg.h"
 
-#if H_3D_IV_MERGE
-#include "TLibCommon/TComDepthMapGenerator.h"
-#endif
 //! \ingroup TAppDecoder
 //! \{
@@ -76 +73 @@
     // for output control
   Bool                            m_abDecFlag[ MAX_GOP ];         ///< decoded flag in one GOP
-#if H_3D_IV_MERGE
-  Int  m_fcoViewDepthId;
-  Char m_fcoOrder[MAX_VIEW_NUM*2];
-#endif
 #if H_MV
   Int                             m_pocLastDisplay      [ MAX_NUM_LAYERS ]; ///< last POC in display order
@@ -89 +82 @@
   FILE*                           m_pScaleOffsetFile;
   CamParsCollector                m_cCamParsCollector;
-#if H_3D_IV_MERGE
-  TComVPSAccess                   m_cVPSAccess;
-  TComSPSAccess                   m_cSPSAccess;
-  TComAUPicAccess                 m_cAUPicAccess;
-#endif
 #endif
 public:
@@ -103 +91 @@
   Void  decode            (); ///< main decoding function
 
-#if H_3D_IV_MERGE 
-  TDecTop* getTDecTop     ( Int viewIdx, Bool isDepth );
-  TComPic*              getPicFromView     ( Int viewIdx, Int poc, bool isDepth ) { return xGetPicFromView( viewIdx, poc, isDepth ); }
-  TComVPSAccess*    getVPSAccess  () { return &m_cVPSAccess;   }
-  TComSPSAccess*    getSPSAccess  () { return &m_cSPSAccess;   }
-  TComAUPicAccess*  getAUPicAccess() { return &m_cAUPicAccess; }
-  TDecTop*          getDecTop0    () { return m_tDecTop[0]; }
-#endif
-
 protected:
   Void  xCreateDecLib     (); ///< create internal classes
@@ -117 +96 @@
   Void  xInitDecLib       (); ///< initialize decoder class
 
-#if H_3D_IV_MERGE 
-  TComPic* xGetPicFromView( Int viewIdx, Int poc, Bool isDepth );
-#endif
 #if H_MV
   Void  xWriteOutput      ( TComList<TComPic*>* pcListPic, Int layerId, Int tId ); ///< write YUV to file