Changeset 876 in 3DVCSoftware for branches/HTM-10.1-dev0/source/Lib/TLibCommon/TComRdCost.cpp

Timestamp:

27 Mar 2014, 18:52:26 (10 years ago)

Author:

tech

Message:

Cleanups part 1.

File:

• branches/HTM-10.1-dev0/source/Lib/TLibCommon/TComRdCost.cpp (modified) (2 diffs)

branches/HTM-10.1-dev0/source/Lib/TLibCommon/TComRdCost.cpp

@@ -599 +599 @@
   cDtParam.uiComp       = 255;    // just for assert: to be sure it was set before use, since only values 0,1 or 2 are allowed.
 
-#if SCU_HS_VSD_BUGFIX_IMPROV_G0163
   cDtParam.bitDepth   = g_bitDepthY;
-#endif
+
   Dist dist = cDtParam.DistFunc( &cDtParam );
 
@@ -2985 +2984 @@
   dD = ( (Double) ( dDM >> DISTORTION_PRECISION_ADJUSTMENT( g_bitDepthY - 8 ) ) ) * m_dDisparityCoeff;
 
-#if SCU_HS_VSD_BUGFIX_IMPROV_G0163
   Double dDepthWeight = ( pOrg[x] >=  ( (1<<(g_bitDepthY - 3)) + (1<<(g_bitDepthY - 2)) ) ? 4 : pOrg[x] > ((1<<g_bitDepthY) >> 4) ? (Float)(pOrg[x] - ((1<<g_bitDepthY) >> 4))/(Float)((1<<g_bitDepthY) >> 3) + 1 : 1.0 );
   Double dTemp = ( 0.5 * fabs(dD) * dDepthWeight * ( abs( (Int) pVirRec[ x+y*iVirStride ] - (Int) pVirRec[ x-1+y*iVirStride ] ) + abs( (Int) pVirRec[ x+y*iVirStride ] - (Int) pVirRec[ x+1+y*iVirStride ] ) ) );
-#else
-  Double dTemp = ( 0.5 * fabs(dD) * ( abs( (Int) pVirRec[ x+y*iVirStride ] - (Int) pVirRec[ x-1+y*iVirStride ] ) + abs( (Int) pVirRec[ x+y*iVirStride ] - (Int) pVirRec[ x+1+y*iVirStride ] ) ) );
-#endif  
   iTemp = (Int) (((dTemp) < 0)? (Int)((dTemp) - 0.5) : (Int)((dTemp) + 0.5));