Changeset 479 in 3DVCSoftware for branches/HTM-DEV-0.3-dev2/source/Lib/TLibDecoder/TDecGop.cpp

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.cpp (modified) (3 diffs)

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

@@ -84 +84 @@
                    TComLoopFilter*         pcLoopFilter,
                    TComSampleAdaptiveOffset* pcSAO
-#if H_3D_IV_MERGE
-                    ,TComDepthMapGenerator*  pcDepthMapGenerator
-#endif
                    )
 {
@@ -96 +93 @@
   m_pcLoopFilter          = pcLoopFilter;
   m_pcSAO  = pcSAO;
-#if H_3D_IV_MERGE
-  m_pcDepthMapGenerator   = pcDepthMapGenerator;
-#endif
 }
 
@@ -158 +152 @@
     m_LFCrossSliceBoundaryFlag.push_back( pcSlice->getLFCrossSliceBoundaryFlag());
   }
-#if H_3D_IV_MERGE
-  if( uiStartCUAddr == 0 )
-  {
-    m_pcDepthMapGenerator->initViewComponent( rpcPic );
-  }
-#endif
 #if H_3D_NBDV 
   if(pcSlice->getViewIndex() && !pcSlice->getIsDepth()) //Notes from QC: this condition shall be changed once the configuration is completed, e.g. in pcSlice->getSPS()->getMultiviewMvPredMode() || ARP in prev. HTM. Remove this comment once it is done.