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

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

@@ -641 +641 @@
     m_tDecTop[ decIdx ] =  new TDecTop;
     m_tDecTop[ decIdx ]->create();
-#if H_3D_IV_MERGE
-    m_tDecTop[ decIdx ]->init(this );
-#else
     m_tDecTop[ decIdx ]->init( );
-#endif
     m_tDecTop[ decIdx ]->setLayerId( layerId );
     m_tDecTop[ decIdx ]->setDecodedPictureHashSEIEnabled(m_decodedPictureHashSEIEnabled);
@@ -682 +678 @@
 }
 #endif
-#if H_3D_IV_MERGE
-// GT: This function is not necessary anymore m_ivPicLists should be used instead
-TComPic* TAppDecTop::xGetPicFromView( Int viewIdx, Int poc, Bool isDepth )
-{
-  assert( ( viewIdx >= 0 ) );
-
-  TComList<TComPic*>* apcListPic = m_tDecTop[ (isDepth ? 1 : 0) + viewIdx * 2 ]->getListPic();
-
-  TComPic* pcPic = NULL;
-  for( TComList<TComPic*>::iterator it=apcListPic->begin(); it!=apcListPic->end(); it++ )
-  {
-    if( (*it)->getPOC() == poc )
-    {
-      pcPic = *it;
-      break;
-    }
-  }
-  return pcPic;
-}
-#endif
 //! \}