Changeset 476 in 3DVCSoftware for branches/HTM-DEV-0.3-dev2/source/Lib/TLibCommon/TComSlice.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/TLibCommon/TComSlice.cpp (modified) (6 diffs)

branches/HTM-DEV-0.3-dev2/source/Lib/TLibCommon/TComSlice.cpp

@@ -68 +68 @@
 , m_iSliceQpDeltaCb               ( 0 )
 , m_iSliceQpDeltaCr               ( 0 )
+#if H_3D_IV_MERGE
+, m_pcTexturePic                  ( NULL )
+#endif
 , m_iDepth                        ( 0 )
 , m_bRefenced                     ( false )
@@ -171 +174 @@
   
   m_colRefIdx = 0;
+#if H_3D_IV_MERGE
+  m_pcTexturePic = NULL;
+#endif
   initEqualRef();
 #if !L0034_COMBINED_LIST_CLEANUP
@@ -185 +191 @@
 #endif
 
+#if H_3D_IV_MERGE
+  m_maxNumMergeCand = MRG_MAX_NUM_CANDS_MEM;
+#else
   m_maxNumMergeCand = MRG_MAX_NUM_CANDS;
+#endif
 
   m_bFinalized=false;
@@ -1847 +1857 @@
   }
 }
+
+#if H_3D_IV_MERGE
+Void
+TComSPS::setPredDepthMapGeneration( UInt uiViewIndex, Bool bIsDepth, UInt uiPdmGenMode, UInt uiPdmMvPredMode)
+{ 
+  AOF( m_uiViewIndex == uiViewIndex );
+  AOF( m_bDepth   == bIsDepth );
+  AOT( ( uiViewIndex == 0 || bIsDepth ) && uiPdmGenMode );
+  AOT( uiPdmMvPredMode && uiPdmGenMode == 0 );
+
+  m_uiPredDepthMapGeneration = uiPdmGenMode;
+  m_uiMultiviewMvPredMode    = uiPdmMvPredMode;
+}
+#endif
+
 const Int TComSPS::m_winUnitX[]={1,2,2,1};
 const Int TComSPS::m_winUnitY[]={1,2,1,1};
@@ -1913 +1938 @@
   ::memset( m_aaiCodedOffset, 0x00, sizeof( m_aaiCodedOffset ) );
 
+#if H_3D_IV_MERGE  
+  m_uiViewIndex           = uiViewIndex;
+  m_bDepth                = false;
+#endif
+
   if( !m_bCamParInSliceHeader )
   {
@@ -1924 +1954 @@
   }
 }
+
+#if H_3D_IV_MERGE
+Void
+TComSPS::initCamParaSPSDepth( UInt uiViewIndex)
+{  
+  m_uiCamParPrecision     = 0;
+  m_bCamParInSliceHeader  = false;
+
+  ::memset( m_aaiCodedScale,  0x00, sizeof( m_aaiCodedScale  ) );
+  ::memset( m_aaiCodedOffset, 0x00, sizeof( m_aaiCodedOffset ) );
+
+  m_uiViewIndex           = uiViewIndex;
+  m_bDepth                = true;
+}
+#endif
 #endif