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

branches/HTM-DEV-0.3-dev2/source/App/TAppEncoder/TAppEncTop.cpp

@@ -121 +121 @@
 #if H_3D
   vps.initViewIndex(); 
+#if H_3D_GEN
+  xSetVPSExtension2        ( vps ); 
+#endif
   m_ivPicLists.setVPS      ( &vps ); 
 #endif
@@ -166 +169 @@
     m_cTEncTop.setDWeight                      ( isDepth ? m_iDWeight             : 0     );
 #endif // H_3D_VSO
-#if H_3D_IV_MERGE
-    m_cTEncTop.setMultiviewMvPredMode          ( m_uiMultiviewMvPredMode     );
-    m_cTEncTop.setPredDepthMapGeneration       ( m_uiPredDepthMapGeneration );
-#endif
 #endif // H_3D
 
@@ -211 +210 @@
     m_cTEncTop.setNumReorderPics             ( m_numReorderPics[i], i );
     m_cTEncTop.setMaxDecPicBuffering         ( m_maxDecPicBuffering[i], i );
-#if H_3D_IV_MERGE
-        m_acTEncDepthTopList[iViewIdx]->setNumReorderPics             ( m_numReorderPics[iViewIdx][i], i );
-        m_acTEncDepthTopList[iViewIdx]->setMaxDecPicBuffering         ( m_maxDecPicBuffering[iViewIdx][i], i );
-#endif
-  }
-#if H_3D_IV_MERGE
-      m_acTEncDepthTopList[iViewIdx]->setQP                           ( m_aiQP[1] );
-
-      m_acTEncDepthTopList[iViewIdx]->setTemporalLayerQPOffset        ( m_aiTLayerQPOffset );
-      m_acTEncDepthTopList[iViewIdx]->setPad                          ( m_aiPad );
-
-      m_acTEncDepthTopList[iViewIdx]->setMaxTempLayer                 ( m_maxTempLayer[iViewIdx] );
-
-      m_acTEncDepthTopList[iViewIdx]->setDisInter4x4                  ( m_bDisInter4x4);
-
-      m_acTEncDepthTopList[iViewIdx]->setUseNSQT( m_enableNSQT );
-      m_acTEncDepthTopList[iViewIdx]->setUseAMP( m_enableAMP );
-#endif
+  }
 #endif
   for( UInt uiLoop = 0; uiLoop < MAX_TLAYER; ++uiLoop )
@@ -625 +607 @@
   for(Int layer=0; layer<m_numberOfLayers; layer++)
   {
-#if H_3D_IV_MERGE
-    m_acTEncTopList[layer]->init(this );
-#else
     m_acTEncTopList[layer]->init( );
-#endif
   }
 #else
@@ -1057 +1035 @@
 }
 #endif
+#if H_3D_GEN
+Void TAppEncTop::xSetVPSExtension2( TComVPS& vps )
+{
+  for ( Int layer = 0; layer < vps.getMaxLayers(); layer++ )
+  {
+    if ( layer != 0 ) 
+    {    
+      if( ( vps.getDepthId( layer ) == 0 ) )
+      {
 #if H_3D_IV_MERGE
- // GT: This function is not necessary anymore m_ivPicLists should be used instead
-TComPic* TAppEncTop::xGetPicFromView( Int viewIdx, Int poc, Bool isDepth )
-{
-  assert( ( viewIdx >= 0 ) && ( viewIdx < m_iNumberOfViews ) );
-
-  TComList<TComPic*>* apcListPic =  m_acTEncTopList[(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;
-};
+        vps.setIvMvPredFlag( layer, m_ivMvPredFlag ); 
+#endif
+      }
+    }
+  }
+}
 #endif
 //! \}