Changeset 1131 in 3DVCSoftware for branches/HTM-13.0-dev0/source/Lib/TLibCommon/TComPrediction.cpp

Timestamp:

18 Feb 2015, 17:39:40 (10 years ago)

Author:

tech

Message:

Cleanup.

File:

• branches/HTM-13.0-dev0/source/Lib/TLibCommon/TComPrediction.cpp (modified) (6 diffs)

branches/HTM-13.0-dev0/source/Lib/TLibCommon/TComPrediction.cpp

@@ -1158 +1158 @@
   pcCU->clipMv(cMv);
 
-#if !LGE_DDD_REMOVAL_J0042_J0030
-#if H_3D_DDD
-  if( pcCU->getUseDDD( uiPartAddr ) )
-  {
-      assert( pcCU->getSPIVMPFlag( uiPartAddr ) == 0 );
-      assert( pcCU->getSlice()->getViewIndex() != 0 );
-
-      Int dstStride = rpcYuvPred->getStride();
-      Int dstStrideC = rpcYuvPred->getCStride();
-      Pel *dst      = rpcYuvPred->getLumaAddr( uiPartAddr );
-      Pel *dstU     = rpcYuvPred->getCbAddr( uiPartAddr );
-      Pel *dstV     = rpcYuvPred->getCrAddr( uiPartAddr );
-
-      Int iWidthC  = iWidth >> 1;
-      Int iHeightC = iHeight >> 1;
-      Int DefaultC = 1 << ( g_bitDepthY - 1);
-      for ( Int i = 0; i < iHeight; i++)
-      {
-          for ( Int j = 0; j < iWidth ; j++)
-          {
-              dst[j] = pcCU->getDDDepth( uiPartAddr );
-          }
-          dst += dstStride;
-      }
-      for ( Int i = 0; i < iHeightC; i++)
-      {
-          for ( Int j = 0; j < iWidthC; j++)
-          {
-              dstU[j] = dstV[j] = DefaultC;
-          }
-          dstU += dstStrideC;
-          dstV += dstStrideC;
-      }
-
-      //return;
-  } else
-#endif
-#endif
 #if H_3D_ARP
   if(pcCU->getARPW( uiPartAddr ) > 0  && pcCU->getSlice()->getRefPic( eRefPicList, iRefIdx )->getPOC()== pcCU->getSlice()->getPOC())
@@ -2190 +2152 @@
       x += pRef[j];
       y += pRec[j];
-#if LGE_CHROMA_IC_J0050_J0034
       if ( eType == TEXT_LUMA )
       {
-#endif
         xx += (pRef[j] * pRef[j])>>precShift;
         xy += (pRef[j] * pRec[j])>>precShift;
-#if LGE_CHROMA_IC_J0050_J0034
-      }
-#endif
+      }
     }
     iCountShift += g_aucConvertToBit[ uiWidth ] + 1;
@@ -2227 +2185 @@
       x += pRef[0];
       y += pRec[0];
-#if LGE_CHROMA_IC_J0050_J0034
       if ( eType == TEXT_LUMA )
       {
-#endif
         xx += (pRef[0] * pRef[0])>>precShift;
         xy += (pRef[0] * pRec[0])>>precShift;
-#if LGE_CHROMA_IC_J0050_J0034
-      }
-#endif      
+      }
       pRef += iRefStride*2;
       pRec += iRecStride*2;
@@ -2249 +2203 @@
   }
 
-#if LGE_CHROMA_IC_J0050_J0034
   if (  eType != TEXT_LUMA )
   {
@@ -2257 +2210 @@
   else
   {
-#endif
   xy += xx >> IC_REG_COST_SHIFT;
   xx += xx >> IC_REG_COST_SHIFT;
@@ -2299 +2251 @@
     }
   }   
-#if LGE_CHROMA_IC_J0050_J0034
-  }
-#endif
+  }
 }
 #endif