Changeset 1226 in 3DVCSoftware

Timestamp:

22 May 2015, 05:45:23 (10 years ago)

Author:

sharpjp-htm

Message:

Replace some H_3D_IC macro with NH_3D_FULL_PEL_DEPTH_MAP_MV_ACC and enable it
Note: the code is not related to illumination compensation but guarded with H_3D_IC macro

Location:

branches/HTM-14.1-update-dev2-Sharp/source/Lib

Files:

• TLibCommon/TComDataCU.cpp (modified) (1 diff)
• TLibCommon/TComPrediction.cpp (modified) (1 diff)
• TLibCommon/TypeDef.h (modified) (1 diff)
• TLibEncoder/TEncSearch.cpp (modified) (7 diffs)

branches/HTM-14.1-update-dev2-Sharp/source/Lib/TLibCommon/TComDataCU.cpp

@@ -5142 +5142 @@
   const TComSPS &sps=*(m_pcSlice->getSPS());
   Int  iMvShift = 2;
-#if H_3D_IC
+#if NH_3D_FULL_PEL_DEPTH_MAP_MV_ACC
   if( getSlice()->getIsDepth() )
     iMvShift = 0;

branches/HTM-14.1-update-dev2-Sharp/source/Lib/TLibCommon/TComPrediction.cpp

@@ -1914 +1914 @@
   Int     yFrac  = mv->getVer() & ((1<<shiftVer)-1);
 
-#if H_3D_IC
+#if NH_3D_FULL_PEL_DEPTH_MAP_MV_ACC
   if( cu->getSlice()->getIsDepth() )
   {

branches/HTM-14.1-update-dev2-Sharp/source/Lib/TLibCommon/TypeDef.h

@@ -85 +85 @@
                                               // SEC_IC_NEIGHBOR_CLIP_I0080    // Clipping of neighboring sample position, JCT3V-I0080
                                               // LGE_CHROMA_IC_J0050_J0034
+#define NH_3D_FULL_PEL_DEPTH_MAP_MV_ACC   1   // Full Pel Interpolation for Depth, HHI_FULL_PEL_DEPTH_MAP_MV_ACC
 
 

branches/HTM-14.1-update-dev2-Sharp/source/Lib/TLibEncoder/TEncSearch.cpp

@@ -5107 +5107 @@
 
   m_pcRdCost->setPredictor  ( *pcMvPred );
-#if H_3D_IC
+#if NH_3D_FULL_PEL_DEPTH_MAP_MV_ACC
   if( pcCU->getSlice()->getIsDepth() )
   {
@@ -5116 +5116 @@
 #endif
     m_pcRdCost->setCostScale  ( 2 );    
-#if H_3D_IC
+#if NH_3D_FULL_PEL_DEPTH_MAP_MV_ACC
   }
 #endif
@@ -5143 +5143 @@
 
   m_pcRdCost->getMotionCost( true, 0, pcCU->getCUTransquantBypass(uiPartAddr) );
-#if H_3D_IC
+#if NH_3D_FULL_PEL_DEPTH_MAP_MV_ACC
   if( ! pcCU->getSlice()->getIsDepth() )
   {
@@ -5156 +5156 @@
   rcMv += (cMvHalf <<= 1);
   rcMv +=  cMvQter;
-#if H_3D_IC
+#if NH_3D_FULL_PEL_DEPTH_MAP_MV_ACC
   }
 #endif
 
   UInt uiMvBits = m_pcRdCost->getBits( rcMv.getHor(), rcMv.getVer() );
-#if H_3D_IC
+#if NH_3D_FULL_PEL_DEPTH_MAP_MV_ACC
   if( pcCU->getSlice()->getIsDepth() )
   {
@@ -5175 +5175 @@
 {
   Int  iMvShift = 2;
-#if H_3D_IC
+#if NH_3D_FULL_PEL_DEPTH_MAP_MV_ACC
   if( pcCU->getSlice()->getIsDepth() )
   {
@@ -5333 +5333 @@
   UInt uiSearchRange = m_iSearchRange;
   pcCU->clipMv( rcMv );
-#if H_3D_IC
+#if NH_3D_FULL_PEL_DEPTH_MAP_MV_ACC
   if( ! pcCU->getSlice()->getIsDepth() )
 #endif
@@ -5353 +5353 @@
       TComMv cMv = m_acMvPredictors[index];
       pcCU->clipMv( cMv );
-#if H_3D_IC
+#if NH_3D_FULL_PEL_DEPTH_MAP_MV_ACC
       if( ! pcCU->getSlice()->getIsDepth() )
       {      
 #endif
         cMv >>= 2;
-#if H_3D_IC
+#if NH_3D_FULL_PEL_DEPTH_MAP_MV_ACC
       }
 #endif