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

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.cpp (modified) (11 diffs)

trunk/source/Lib/TLibCommon/TComPic.cpp

@@ -59 +59 @@
 #endif
 #endif
-#if HHI_INTER_VIEW_MOTION_PRED
+#if H3D_IVMP
   m_pcOrgDepthMap     = NULL;
 #endif
-#if HHI_INTER_VIEW_RESIDUAL_PRED
+#if H3D_IVRP
   m_pcResidual        = NULL;
 #endif
@@ -76 +76 @@
   m_pcUsedPelsMap     = NULL;
 #endif
-#if SONY_COLPIC_AVAILABILITY
-  m_iViewOrderIdx     = 0;
+#if INTER_VIEW_VECTOR_SCALING_C0115
+  m_iViewOrderIdx     = 0;    // will be changed to view_id
 #endif
   m_aaiCodedScale     = 0;
@@ -84 +84 @@
   m_bReduceBitsQTL    = 0;
 #endif
-#if QC_SIMPLE_NBDV_B0047
+#if H3D_NBDV
   m_bRapCheck = false;
   m_eRapRefList = REF_PIC_LIST_0;
@@ -157 +157 @@
 #endif
 #endif
-#if HHI_INTER_VIEW_MOTION_PRED
+#if H3D_IVMP
   if( m_pcOrgDepthMap )
   {
@@ -165 +165 @@
   }
 #endif
-#if HHI_INTER_VIEW_RESIDUAL_PRED
+#if H3D_IVRP
   if( m_pcResidual )
   {
@@ -206 +206 @@
 #endif
 
-#if HHI_INTER_VIEW_MOTION_PRED
+#if H3D_IVMP
 Void
 TComPic::addOrgDepthMapBuffer()
@@ -222 +222 @@
 #endif
 
-#if HHI_INTER_VIEW_RESIDUAL_PRED
+#if H3D_IVRP
 Void
 TComPic::addResidualBuffer()
@@ -259 +259 @@
 #endif
 
-#if HHI_INTER_VIEW_MOTION_PRED
+#if H3D_IVMP
 Void
 TComPic::removeOrgDepthMapBuffer()
@@ -272 +272 @@
 #endif
 
-#if HHI_INTER_VIEW_RESIDUAL_PRED
+#if H3D_IVRP
 Void
 TComPic::removeResidualBuffer()
@@ -316 +316 @@
     m_pbValidSlice[s] = true;
   }
-#if !LCU_SYNTAX_ALF
-  if( pSliceStartAddress == NULL || (numSlices == 1 && numTiles == 1) )
-  {
-    return;
-  }
-#endif
   m_pSliceSUMap = new Int[maxNumSUInLCU * numLCUInPic];
 
@@ -489 +483 @@
   }
 }
-#if QC_SIMPLE_NBDV_B0047
+#if H3D_NBDV
 Bool TComPic::getDisCandRefPictures(Int iColPOC)
 {