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

branches/HTM-DEV-0.3-dev2/source/Lib/TLibEncoder/TEncGOP.h

@@ -59 +59 @@
 #include <vector>
 
-#if H_3D_IV_MERGE
-#include "TLibCommon/TComDepthMapGenerator.h"
-#endif
 //! \ingroup TLibEncoder
 //! \{
@@ -110 +107 @@
   Int                     m_viewIndex; 
   Bool                    m_isDepth;
-#if H_3D_IV_MERGE
-  TComDepthMapGenerator*  m_pcDepthMapGenerator;
-#endif
 #endif
 #endif
@@ -172 +166 @@
   
   TComList<TComPic*>*   getListPic()      { return m_pcListPic; }
-#if H_3D_IV_MERGE
-  TEncTop* getEncTop() { return m_pcEncTop; }
-#endif
+
 #if !H_MV
   Void  printOutSummary      ( UInt uiNumAllPicCoded );