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

Timestamp:

6 Jun 2013, 11:46:05 (11 years ago)

Author:

hhi

Message:

Integation of depth intra methods in macro H_3D_DIM, including:

• DMM coding modes in H_3D_DIM_DMM.
• RBC coding mode in H_3D_DIM_RBC.

File:

• branches/HTM-DEV-0.3-dev1/source/Lib/TLibCommon/TComSlice.h (modified) (6 diffs)

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

@@ -524 +524 @@
 #if H_3D
   Int         m_viewIndex                [MAX_NUM_LAYERS   ];
+  Bool        m_vpsDepthModesFlag        [MAX_NUM_LAYERS   ];
 #endif
 
@@ -642 +643 @@
   Int     getDepthId      ( Int layerIdInVps )                             { return getScalabilityId( layerIdInVps, DEPTH_ID ); }
   Int     getLayerIdInNuh( Int viewIndex, Bool depthFlag );  
+
+  Void    setVpsDepthModesFlag( Int layerIdInVps, Bool val )               { m_vpsDepthModesFlag[ layerIdInVps ] = val; }
+  Bool    getVpsDepthModesFlag( Int layerIdInVps )                         { return m_vpsDepthModesFlag[ layerIdInVps ]; }
 #endif
 
@@ -1424 +1428 @@
   TComPPS*    m_pcPPS;
   TComPic*    m_pcPic;
+#if H_3D
+  TComPicLists* m_picLists;
+#endif
 #if ADAPTIVE_QP_SELECTION
   TComTrQuant* m_pcTrQuant;
@@ -1542 +1549 @@
   Int       getNumRefIdx        ( RefPicList e )                { return  m_aiNumRefIdx[e];             }
   TComPic*  getPic              ()                              { return  m_pcPic;                      }
+#if H_3D
+  TComPicLists* getPicLists     ()                              { return m_picLists; }
+#endif
   TComPic*  getRefPic           ( RefPicList e, Int iRefIdx)    { return  m_apcRefPicList[e][iRefIdx];  }
   Int       getRefPOC           ( RefPicList e, Int iRefIdx)    { return  m_aiRefPOCList[e][iRefIdx];   }
@@ -1596 +1606 @@
   Void      setNumRefIdx        ( RefPicList e, Int i )         { m_aiNumRefIdx[e]    = i;      }
   Void      setPic              ( TComPic* p )                  { m_pcPic             = p;      }
+#if H_3D
+  Void      setPicLists         ( TComPicLists* p )             { m_picLists          = p;      }
+#endif
   Void      setDepth            ( Int iDepth )                  { m_iDepth            = iDepth; }
   
@@ -1756 +1769 @@
   Int*      getInvCodedScale      ()  { return m_aaiCodedScale [1]; }
   Int*      getInvCodedOffset     ()  { return m_aaiCodedOffset[1]; }
+
+  Bool      getVpsDepthModesFlag  ()  { return getVPS()->getVpsDepthModesFlag( getVPS()->getLayerIdInVps( m_layerId ) ); }
 #endif
 #endif