Changeset 479 in 3DVCSoftware for branches/HTM-DEV-0.3-dev2/source/Lib/TLibDecoder/TDecTop.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/Lib/TLibDecoder/TDecTop.h (modified) (4 diffs)

branches/HTM-DEV-0.3-dev2/source/Lib/TLibDecoder/TDecTop.h

@@ -45 +45 @@
 #include "TLibCommon/TComTrQuant.h"
 #include "TLibCommon/SEI.h"
-#if H_3D_IV_MERGE
-#include "TLibCommon/TComDepthMapGenerator.h"
-#endif
 
 #include "TDecGop.h"
@@ -225 +222 @@
   Bool                    m_isDepth;
   CamParsCollector*       m_pcCamParsCollector;
-#if H_3D_IV_MERGE
-  TComDepthMapGenerator   m_cDepthMapGenerator;
-  TAppDecTop*             m_tAppDecTop;
-#endif
 #endif
 #endif
@@ -241 +234 @@
   void setDecodedPictureHashSEIEnabled(Int enabled) { m_cGopDecoder.setDecodedPictureHashSEIEnabled(enabled); }
 
-#if H_3D_IV_MERGE
-  Void  init(TAppDecTop* pcTAppDecTop);
-#else
   Void  init();
-#endif
 #if H_MV  
   Bool  decode(InputNALUnit& nalu, Int& iSkipFrame, Int& iPOCLastDisplay, Bool newLayer );
@@ -276 +265 @@
   Bool                    getIsDepth            ()               { return m_isDepth;    }
   Void                    setCamParsCollector( CamParsCollector* pcCamParsCollector ) { m_pcCamParsCollector = pcCamParsCollector; }
-#if H_3D_IV_MERGE
-  TComDepthMapGenerator*  getDepthMapGenerator  () { return &m_cDepthMapGenerator; }
-#endif
 #endif
 #endif