Changeset 476 in 3DVCSoftware for branches/HTM-DEV-0.3-dev2/source/Lib/TLibEncoder/TEncTop.cpp

Timestamp:

18 Jun 2013, 05:16:27 (11 years ago)

Author:

mediatek-htm

Message:

Integration of 3D-HEVC merge related coding tools:
Inter-view motion merge candidate
HHI_INTER_VIEW_MOTION_PRED
SAIT_IMPROV_MOTION_PRED_M24829, improved inter-view motion vector prediction
QC_MRG_CANS_B0048 , JCT3V-B0048, B0086, B0069
OL_DISMV_POS_B0069 , different pos for disparity MV candidate, B0069
MTK_INTERVIEW_MERGE_A0049 , second part
QC_AMVP_MRG_UNIFY_IVCAN_C0051
TEXTURE MERGING CANDIDATE , JCT3V-C0137

Notes: Two configurations are added:
PredDepthMapGen : 1
MultiviewMvPred : 7

From: yiwen.chen@… (MediaTek)

File:

• branches/HTM-DEV-0.3-dev2/source/Lib/TLibEncoder/TEncTop.cpp (modified) (6 diffs)

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

@@ -119 +119 @@
 #endif
   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 )
@@ -225 +229 @@
   m_cLoopFilter.        destroy();
   m_cRateCtrl.          destroy();
+
+#if H_3D_IV_MERGE
+  m_cDepthMapGenerator. destroy();
+#endif
   // SBAC RD
   if( m_bUseSBACRD )
@@ -284 +292 @@
 }
 
+#if H_3D_IV_MERGE
+Void TEncTop::init( TAppEncTop* pcTAppEncTop)
+#else
 Void TEncTop::init()
+#endif
 {
   // initialize SPS
@@ -306 +318 @@
   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();
@@ -658 +675 @@
   {
     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
 }
@@ -1300 +1334 @@
 }
 #endif
+
+
 //! \}