Changeset 476 in 3DVCSoftware for branches/HTM-DEV-0.3-dev2/source/Lib/TLibCommon/TComSlice.h

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.h (modified) (6 diffs)

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

@@ -53 +53 @@
 #if H_MV
 class TComPicLists; 
+#endif
+
+#if H_3D_IV_MERGE
+class TComDepthMapGenerator;
 #endif
 // ====================================================================================================================
@@ -981 +985 @@
   Int         m_aaiCodedScale [2][MAX_NUM_LAYERS];
   Int         m_aaiCodedOffset[2][MAX_NUM_LAYERS];
+#if H_3D_IV_MERGE
+  UInt        m_uiMultiviewMvPredMode;
+  UInt        m_uiPredDepthMapGeneration;
+
+  UInt        m_uiViewIndex;
+  Bool        m_bDepth;
+  TComDepthMapGenerator* m_pcDepthMapGenerator;
+#endif
 #endif
 public:
@@ -1124 +1136 @@
   Int* getInvCodedScale      ()  { return m_aaiCodedScale [1]; }
   Int* getInvCodedOffset     ()  { return m_aaiCodedOffset[1]; }
+#if H_3D_IV_MERGE
+  Void  initCamParaSPSDepth      ( UInt uiViewIndex);
+  UInt  getMultiviewMvPredMode   ()          { return m_uiMultiviewMvPredMode;    }
+  UInt  getPredDepthMapGeneration()          { return m_uiPredDepthMapGeneration; }
+
+  UInt  getViewIndex             ()  { return m_uiViewIndex; }
+  Bool  isDepth               ()  { return m_bDepth; }
+  Void  setDepthMapGenerator( TComDepthMapGenerator* pcDepthMapGenerator )  { m_pcDepthMapGenerator = pcDepthMapGenerator; }
+  TComDepthMapGenerator*  getDepthMapGenerator()                                              { return m_pcDepthMapGenerator; }
+  Void setPredDepthMapGeneration( UInt uiViewIndex, Bool bIsDepth, UInt uiPdmGenMode = 0, UInt uiPdmMvPredMode = 0);
+#endif
 #endif
 };
@@ -1414 +1437 @@
 #endif
   Bool        m_bIsUsedAsLongTerm[2][MAX_NUM_REF+1];
+#if H_3D_IV_MERGE
+  TComPic*    m_pcTexturePic;
+#endif
   Int         m_iDepth;
   
@@ -1544 +1570 @@
   TComPic*  getRefPic           ( RefPicList e, Int iRefIdx)    { return  m_apcRefPicList[e][iRefIdx];  }
   Int       getRefPOC           ( RefPicList e, Int iRefIdx)    { return  m_aiRefPOCList[e][iRefIdx];   }
+#if H_3D_IV_MERGE
+  TComPic*  getTexturePic       () const                        { return  m_pcTexturePic; }
+#endif
   Int       getDepth            ()                              { return  m_iDepth;                     }
   UInt      getColFromL0Flag    ()                              { return  m_colFromL0Flag;              }
@@ -1594 +1623 @@
   Void      setRefPic           ( TComPic* p, RefPicList e, Int iRefIdx ) { m_apcRefPicList[e][iRefIdx] = p; }
   Void      setRefPOC           ( Int i, RefPicList e, Int iRefIdx ) { m_aiRefPOCList[e][iRefIdx] = i; }
+#if H_3D_IV_MERGE
+  Void      setTexturePic       ( TComPic *pcTexturePic )       { m_pcTexturePic = pcTexturePic; }
+#endif
   Void      setNumRefIdx        ( RefPicList e, Int i )         { m_aiNumRefIdx[e]    = i;      }
   Void      setPic              ( TComPic* p )                  { m_pcPic             = p;      }