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

branches/HTM-DEV-0.3-dev2/source/Lib/TLibEncoder/TEncTop.cpp

@@ -120 +120 @@
   m_cLoopFilter.        create( g_uiMaxCUDepth );
 
-#if H_3D_IV_MERGE
-  m_cDepthMapGenerator. create( false, getSourceWidth(), getSourceHeight(), g_uiMaxCUDepth, g_uiMaxCUWidth, g_uiMaxCUHeight, g_bitDepthY, PDM_SUB_SAMP_EXP_X(m_uiPredDepthMapGeneration), PDM_SUB_SAMP_EXP_Y(m_uiPredDepthMapGeneration) );
-#endif
 #if RATE_CONTROL_LAMBDA_DOMAIN
   if ( m_RCEnableRateControl )
@@ -228 +225 @@
   m_cLoopFilter.        destroy();
   m_cRateCtrl.          destroy();
-#if H_3D_IV_MERGE
-  m_cDepthMapGenerator. destroy();
-#endif
   // SBAC RD
   if( m_bUseSBACRD )
@@ -290 +284 @@
 }
 
-#if H_3D_IV_MERGE
-Void TEncTop::init( TAppEncTop* pcTAppEncTop)
-#else
 Void TEncTop::init()
-#endif
 {
   // initialize SPS
@@ -316 +306 @@
   m_cCuEncoder.   init( this );
   
-#if H_3D_IV_MERGE
-  m_pcTAppEncTop = pcTAppEncTop;
-  m_cDepthMapGenerator.init( (TComPrediction*)this->getPredSearch(), m_pcTAppEncTop->getVPSAccess(), m_pcTAppEncTop->getSPSAccess(), m_pcTAppEncTop->getAUPicAccess() );
-#endif
   // initialize transform & quantization class
   m_pcCavlcCoder = getCavlcCoder();
@@ -672 +658 @@
   {
     m_cSPS.initCamParaSPS           ( m_viewIndex, m_uiCamParPrecision, m_bCamParInSliceHeader, m_aaiCodedScale, m_aaiCodedOffset );
-#if H_3D_IV_MERGE
-    if( m_viewIndex )
-    {
-      m_cSPS.setPredDepthMapGeneration( m_viewIndex, false, m_uiPredDepthMapGeneration, m_uiMultiviewMvPredMode);
-    }
-    else
-    {
-      m_cSPS.setPredDepthMapGeneration( m_viewIndex, false );
-    }
-#endif
-  }
-#if H_3D_IV_MERGE
-  else
-  {
-    m_cSPS.initCamParaSPSDepth           ( m_viewIndex);
-    m_cSPS.setPredDepthMapGeneration( m_viewIndex, true );
-  }
-#endif
+  }
 #endif
 }