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

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

@@ -51 +51 @@
 #include "TLibCommon/TComSampleAdaptiveOffset.h"
 
-#if H_3D_IV_MERGE
-#include "TLibCommon/TComDepthMapGenerator.h"
-#endif
 #include "TDecEntropy.h"
 #include "TDecSlice.h"
@@ -82 +79 @@
   TComLoopFilter*       m_pcLoopFilter;
   
-#if H_3D_IV_MERGE
-  TComDepthMapGenerator*  m_pcDepthMapGenerator;
-#endif
   TComSampleAdaptiveOffset*     m_pcSAO;
   Double                m_dDecTime;
@@ -104 +98 @@
                  TComLoopFilter*         pcLoopFilter,
                  TComSampleAdaptiveOffset* pcSAO
-#if H_3D_IV_MERGE
-                 ,TComDepthMapGenerator* pcDepthMapGenerator
-#endif
                  );
   Void  create  ();