Changeset 1279 in 3DVCSoftware for branches/HTM-14.1-update-dev1/source/Lib/TLibCommon/TComRdCost.cpp

Timestamp:

15 Jul 2015, 14:57:32 (9 years ago)

Author:

tech

Message:

Merged 14.1-update-dev2@1277.

Location:

branches/HTM-14.1-update-dev1

Files:

• . (modified) (1 prop)
• source/Lib/TLibCommon/TComRdCost.cpp (modified) (30 diffs)

branches/HTM-14.1-update-dev1/source/Lib/TLibCommon/TComRdCost.cpp

@@ -311 +311 @@
   m_bUseEstimatedVSD        = false; 
 #endif
-#if H_3D_DBBP
+#if NH_3D_DBBP
   m_bUseMask                = false;
 #endif
@@ -340 +340 @@
   rcDistParam.DistFunc = m_afpDistortFunc[eDFunc + g_aucConvertToBit[ rcDistParam.iCols ] + 1 ];
 
-#if H_3D_DBBP
+#if NH_3D_DBBP
   if( m_bUseMask )
   {
@@ -397 +397 @@
   }
 
-#if H_3D_DBBP
+#if NH_3D_DBBP
   if( m_bUseMask )
   {
@@ -446 +446 @@
   }
 
-#if H_3D_DBBP
+#if NH_3D_DBBP
   if( m_bUseMask )
   {
@@ -468 +468 @@
   rcDP.bitDepth   = bitDepth;
   rcDP.DistFunc   = m_afpDistortFunc[ ( bHadamard ? DF_HADS : DF_SADS ) + g_aucConvertToBit[ iWidth ] + 1 ];
-#if H_3D_DBBP
+#if NH_3D_DBBP
   if( m_bUseMask )
   {
@@ -561 +561 @@
   cDtParam.bitDepth     = bitDepth;
 
-#if H_3D_IC
+#if NH_3D_IC
   cDtParam.bUseIC       = false;
 #endif
@@ -602 +602 @@
   cDtParam.bitDepth   = bitDepth;
 
+#if NH_3D_IC_FIX
+  cDtParam.bUseIC       = false;
+#endif
+#if H_3D_INTER_SDC_FIX
+  cDtParam.bUseSDCMRSAD = false;
+#endif
+
   Dist dist = cDtParam.DistFunc( &cDtParam );
 
@@ -648 +655 @@
 // ====================================================================================================================
 
-#if H_3D_DBBP
+#if NH_3D_DBBP
 // --------------------------------------------------------------------------------------------------------------------
 // Masked distortion functions
@@ -689 +696 @@
   
   AOF(!pcDtParam->bApplyWeight);
-#if H_3D_IC
+#if NH_3D_IC
   AOF(!pcDtParam->bUseIC);
 #endif
@@ -763 +770 @@
     return TComRdCostWeightPrediction::xGetSADw( pcDtParam );
   }
-#if H_3D_IC
+#if NH_3D_IC
   if( pcDtParam->bUseIC )
   {
@@ -805 +812 @@
   }
 
-#if H_3D_IC
+#if NH_3D_IC
   if( pcDtParam->bUseIC )
   {
@@ -850 +857 @@
   }
 
-#if H_3D_IC
+#if NH_3D_IC
   if( pcDtParam->bUseIC )
   {
@@ -899 +906 @@
   }
 
-#if H_3D_IC
+#if NH_3D_IC
   if( pcDtParam->bUseIC )
   {
@@ -955 +962 @@
     return TComRdCostWeightPrediction::xGetSADw( pcDtParam );
   }
-#if H_3D_IC
+#if NH_3D_IC
   if( pcDtParam->bUseIC )
   {
@@ -1003 +1010 @@
 Distortion TComRdCost::xGetSAD16N( DistParam* pcDtParam )
 {
-#if H_3D_IC
+#if NH_3D_IC
   if( pcDtParam->bUseIC )
   {
@@ -1063 +1070 @@
   }
 
-#if H_3D_IC
+#if NH_3D_IC
   if( pcDtParam->bUseIC )
   {
@@ -1136 +1143 @@
   }
 
-#if H_3D_IC
+#if NH_3D_IC
   if( pcDtParam->bUseIC )
   {
@@ -1201 +1208 @@
   }
 
-#if H_3D_IC
+#if NH_3D_IC
   if( pcDtParam->bUseIC )
   {
@@ -1305 +1312 @@
     return TComRdCostWeightPrediction::xGetSADw( pcDtParam );
   }
-#if H_3D_IC
+#if NH_3D_IC
   if( pcDtParam->bUseIC )
   {
@@ -1388 +1395 @@
 
 
-#if H_3D_IC || H_3D_INTER_SDC
+#if NH_3D_IC || H_3D_INTER_SDC
 UInt TComRdCost::xGetSADic( DistParam* pcDtParam )
 {
   if ( pcDtParam->bApplyWeight )
   {
-    return xGetSADw( pcDtParam );
+    return TComRdCostWeightPrediction::xGetSADw( pcDtParam );
   }
   Pel* piOrg   = pcDtParam->pOrg;
@@ -1441 +1448 @@
   if ( pcDtParam->bApplyWeight ) 
   {
-    return xGetSADw( pcDtParam );
+    return TComRdCostWeightPrediction::xGetSADw( pcDtParam );
   }
   Pel* piOrg   = pcDtParam->pOrg;
@@ -1498 +1505 @@
   if ( pcDtParam->bApplyWeight )
   {
-    return xGetSADw( pcDtParam );
+    return TComRdCostWeightPrediction::xGetSADw( pcDtParam );
   }
   Pel* piOrg      = pcDtParam->pOrg;
@@ -1567 +1574 @@
   if ( pcDtParam->bApplyWeight )
   {
-    return xGetSADw( pcDtParam );
+    return TComRdCostWeightPrediction::xGetSADw( pcDtParam );
   }
   Pel* piOrg   = pcDtParam->pOrg;
@@ -1660 +1667 @@
   if ( pcDtParam->bApplyWeight )
   {
-    return xGetSADw( pcDtParam );
+    return TComRdCostWeightPrediction::xGetSADw( pcDtParam );
   }
   Pel* piOrg   = pcDtParam->pOrg;
@@ -1835 +1842 @@
   if ( pcDtParam->bApplyWeight )
   {
-    return xGetSADw( pcDtParam );
+    return TComRdCostWeightPrediction::xGetSADw( pcDtParam );
   }
   Pel* piOrg   = pcDtParam->pOrg;
@@ -1977 +1984 @@
   if ( pcDtParam->bApplyWeight )
   {
-    return xGetSADw( pcDtParam );
+    return TComRdCostWeightPrediction::xGetSADw( pcDtParam );
   }
   Pel* piOrg   = pcDtParam->pOrg;
@@ -2094 +2101 @@
   if ( pcDtParam->bApplyWeight )
   {
-    return xGetSADw( pcDtParam );
+    return TComRdCostWeightPrediction::xGetSADw( pcDtParam );
   }
   Pel* piOrg   = pcDtParam->pOrg;
@@ -2332 +2339 @@
   if ( pcDtParam->bApplyWeight )
   {
-    return xGetSADw( pcDtParam );
+    return TComRdCostWeightPrediction::xGetSADw( pcDtParam );
   }
 
@@ -3327 +3334 @@
     return TComRdCostWeightPrediction::xGetHADsw( pcDtParam );
   }
-#if H_3D_IC
+#if NH_3D_IC
   if( pcDtParam->bUseIC )
   {
@@ -3403 +3410 @@
 }
 
-#if H_3D_IC || H_3D_INTER_SDC
+#if NH_3D_IC || H_3D_INTER_SDC
 UInt TComRdCost::xGetHADsic( DistParam* pcDtParam )
 {
   if ( pcDtParam->bApplyWeight )
   {
-    return xGetHADsw( pcDtParam );
+    return TComRdCostWeightPrediction::xGetHADsw( pcDtParam );
   }
   Pel* piOrg   = pcDtParam->pOrg;