Changeset 296 in 3DVCSoftware for trunk/source/Lib/TLibCommon/TComPic.h

Timestamp:

20 Feb 2013, 22:07:43 (12 years ago)

Author:

tech

Message:

Reintegrated branch 5.1-dev0 rev. 295.

File:

• trunk/source/Lib/TLibCommon/TComPic.h (modified) (8 diffs)

trunk/source/Lib/TLibCommon/TComPic.h

@@ -77 +77 @@
 #endif
 
-#if HHI_INTER_VIEW_MOTION_PRED
+#if H3D_IVMP
   TComPicYuv*           m_pcOrgDepthMap;          //  original depth map
-#if QC_MULTI_DIS_CAN_A0097
-  Bool          m_checked;
-#endif
-#if QC_SIMPLE_NBDV_B0047
+#if H3D_NBDV
+  Bool        m_checked;
   UInt        m_uiRapRefIdx;
   RefPicList  m_eRapRefList;
@@ -88 +86 @@
 #endif
 #endif
-#if HHI_INTER_VIEW_RESIDUAL_PRED
+#if H3D_IVRP
   TComPicYuv*           m_pcResidual;             //  residual buffer (coded or inter-view predicted residual)
 #endif
@@ -112 +110 @@
   TComPicYuv*           m_pcUsedPelsMap;
 #endif
-#if SONY_COLPIC_AVAILABILITY
-  Int                   m_iViewOrderIdx;
+#if INTER_VIEW_VECTOR_SCALING_C0115
+  Int                   m_iViewOrderIdx;    // will be changed to view_id
 #endif
   Int**                 m_aaiCodedScale;
@@ -167 +165 @@
 
 #endif
-#if HHI_INTER_VIEW_MOTION_PRED
+#if H3D_IVMP
   TComPicYuv*   getOrgDepthMap()      { return  m_pcOrgDepthMap; }
-#if QC_MULTI_DIS_CAN_A0097
+#if H3D_NBDV
   Void          setCandPicCheckedFlag (Bool bchecked)   { m_checked = bchecked; }
   Bool          getCandPicCheckedFlag ()                { return m_checked;}
@@ -175 +173 @@
 #endif
 
-#if HHI_INTER_VIEW_RESIDUAL_PRED
+#if H3D_IVRP
   TComPicYuv*   getResidual()         { return  m_pcResidual; }
 #endif
-#if QC_SIMPLE_NBDV_B0047
+#if H3D_NBDV
   UInt          getRapRefIdx()                         {return m_uiRapRefIdx;}
   RefPicList    getRapRefList()                        {return m_eRapRefList;}
@@ -188 +186 @@
 #endif
 
-#if SONY_COLPIC_AVAILABILITY
-  Void          setViewOrderIdx(Int i)                        { m_iViewOrderIdx = i; }
-  Int           getViewOrderIdx()                             { return m_iViewOrderIdx; }
+#if INTER_VIEW_VECTOR_SCALING_C0115
+  Void          setViewOrderIdx(Int i)                        { m_iViewOrderIdx = i; }        // will be changed to view_id
+  Int           getViewOrderIdx()                             { return m_iViewOrderIdx; }    // will be changed to view_id
 #endif
 
@@ -252 +250 @@
   Void          addPrdDepthMapBuffer    ( UInt uiSubSampExpX, UInt uiSubSampExpY );
 #endif
-#if HHI_INTER_VIEW_MOTION_PRED
+#if H3D_IVMP
   Void          addOrgDepthMapBuffer    ();
 #endif
-#if HHI_INTER_VIEW_RESIDUAL_PRED
+#if H3D_IVRP
   Void          addResidualBuffer       ();
 #endif
@@ -261 +259 @@
   Void          removePrdDepthMapBuffer ();
 #endif
-#if HHI_INTER_VIEW_MOTION_PRED
+#if H3D_IVMP
   Void          removeOrgDepthMapBuffer ();
 #endif
-#if HHI_INTER_VIEW_RESIDUAL_PRED
+#if H3D_IVRP
   Void          removeResidualBuffer    ();
 #endif