Changeset 655 in 3DVCSoftware for trunk/source/Lib/TLibCommon/TComRdCost.cpp

Timestamp:

23 Oct 2013, 23:01:30 (12 years ago)

Author:

tech

Message:

Merged 8.1-Cleanup@654

File:

• trunk/source/Lib/TLibCommon/TComRdCost.cpp (modified) (16 diffs)

trunk/source/Lib/TLibCommon/TComRdCost.cpp

@@ -484 +484 @@
 }
 
-#if SCU_HS_FAST_DEPTH_INTRA_E0238_HHIFIX
+#if H_3D_FAST_DEPTH_INTRA
 
 UInt TComRdCost::calcVAR (Pel* pi0, Int stride, Int width, Int height, Int cuDepth)
@@ -542 +542 @@
   cDtParam.bUseIC       = false;
 #endif
-#if LGE_INTER_SDC_E0156
+#if H_3D_INTER_SDC
   cDtParam.bUseSDCMRSAD = false;
 #endif
@@ -605 +605 @@
     dist = (Dist) (iDWeight * distDepth + iVSOWeight * dist ) / ( iDWeight + iVSOWeight);
   }
-#if H_3D_FIX_UINT_WARNING
+
   return (UInt) dist; 
-#else
-  return dist; 
-#endif
-
-}
-#endif
-
-#if RATE_CONTROL_LAMBDA_DOMAIN && !M0036_RC_IMPROVEMENT
+}
+#endif
+
+#if (RATE_CONTROL_LAMBDA_DOMAIN && !M0036_RC_IMPROVEMENT) || KWU_RC_MADPRED_E0227
 UInt TComRdCost::getSADPart ( Int bitDepth, Pel* pelCur, Int curStride,  Pel* pelOrg, Int orgStride, UInt width, UInt height )
 {
@@ -652 +648 @@
   }
 #endif
-#if LGE_INTER_SDC_E0156
+#if H_3D_INTER_SDC
   if( pcDtParam->bUseSDCMRSAD )
   {
@@ -692 +688 @@
   }
 #endif
-#if LGE_INTER_SDC_E0156
+#if H_3D_INTER_SDC
   if( pcDtParam->bUseSDCMRSAD )
   {
@@ -735 +731 @@
   }
 #endif
-#if LGE_INTER_SDC_E0156
+#if H_3D_INTER_SDC
   if( pcDtParam->bUseSDCMRSAD )
   {
@@ -782 +778 @@
   }
 #endif
-#if LGE_INTER_SDC_E0156
+#if H_3D_INTER_SDC
   if( pcDtParam->bUseSDCMRSAD )
   {
@@ -838 +834 @@
   }
 #endif
-#if LGE_INTER_SDC_E0156
+#if H_3D_INTER_SDC
   if( pcDtParam->bUseSDCMRSAD )
   {
@@ -886 +882 @@
   }
 #endif
-#if LGE_INTER_SDC_E0156
+#if H_3D_INTER_SDC
   if( pcDtParam->bUseSDCMRSAD )
   {
@@ -944 +940 @@
   }
 #endif
-#if LGE_INTER_SDC_E0156
+#if H_3D_INTER_SDC
   if( pcDtParam->bUseSDCMRSAD )
   {
@@ -1016 +1012 @@
   }
 #endif
-#if LGE_INTER_SDC_E0156
+#if H_3D_INTER_SDC
   if( pcDtParam->bUseSDCMRSAD )
   {
@@ -1081 +1077 @@
   }
 #endif
-#if LGE_INTER_SDC_E0156
+#if H_3D_INTER_SDC
   if( pcDtParam->bUseSDCMRSAD )
   {
@@ -1185 +1181 @@
   }
 #endif
-#if LGE_INTER_SDC_E0156
+#if H_3D_INTER_SDC
   if( pcDtParam->bUseSDCMRSAD )
   {
@@ -1261 +1257 @@
 #endif
 
-#if H_3D_IC || LGE_INTER_SDC_E0156
+#if H_3D_IC || H_3D_INTER_SDC
 UInt TComRdCost::xGetSADic( DistParam* pcDtParam )
 {
@@ -3513 +3509 @@
   }
 #endif
-#if LGE_INTER_SDC_E0156
+#if H_3D_INTER_SDC
   if( pcDtParam->bUseSDCMRSAD )
   {
@@ -3616 +3612 @@
 }
 
-#if H_3D_IC || LGE_INTER_SDC_E0156
+#if H_3D_IC || H_3D_INTER_SDC
 UInt TComRdCost::xGetHADsic( DistParam* pcDtParam )
 {