Changeset 821 in 3DVCSoftware for branches/HTM-9.3-dev1-RWTH/source/Lib/TLibCommon/TComRdCost.cpp

Timestamp:

5 Feb 2014, 12:28:40 (10 years ago)

Author:

rwth

Message:

• fixed bracketing
• removed global variable

File:

• branches/HTM-9.3-dev1-RWTH/source/Lib/TLibCommon/TComRdCost.cpp (modified) (10 diffs)

branches/HTM-9.3-dev1-RWTH/source/Lib/TLibCommon/TComRdCost.cpp

@@ -327 +327 @@
   
 #if H_3D_DBBP
-  if( g_bTestVirtualParts )
+  if( m_bUseMask )
   {
     if( eDFunc >= DF_SSE && eDFunc <= DF_SSE16N )
+    {
       rcDistParam.DistFunc = TComRdCost::xGetMaskedSSE;
+    }
     else if( eDFunc >= DF_SAD && eDFunc <= DF_SADS16N )
+    {
       rcDistParam.DistFunc = TComRdCost::xGetMaskedSAD;
+    }
     else if( eDFunc >= DF_HADS && eDFunc <= DF_HADS16N )
+    {
       rcDistParam.DistFunc = TComRdCost::xGetMaskedHADs;
+    }
     else if( eDFunc >= DF_VSD && eDFunc <= DF_VSD16N )
+    {
       rcDistParam.DistFunc = TComRdCost::xGetMaskedVSD;
+    }
     else if( eDFunc >= DF_SAD12 && eDFunc <= DF_SADS48 )
+    {
       rcDistParam.DistFunc = TComRdCost::xGetMaskedSAD;
+    }
   }
 #endif
@@ -377 +387 @@
   
 #if H_3D_DBBP
-  if( g_bTestVirtualParts )
+  if( m_bUseMask )
   {
     rcDistParam.DistFunc = TComRdCost::xGetMaskedSAD;
@@ -436 +446 @@
   
 #if H_3D_DBBP
-  if( g_bTestVirtualParts )
-  {
-    if( !bHADME )
-      rcDistParam.DistFunc = TComRdCost::xGetMaskedSAD;
-    else
-      rcDistParam.DistFunc = TComRdCost::xGetMaskedHADs;
+  if( m_bUseMask )
+  {
+    rcDistParam.DistFunc = (bHADME)?TComRdCost::xGetMaskedHADs:TComRdCost::xGetMaskedSAD;
   }
 #endif
@@ -468 +475 @@
   
 #if H_3D_DBBP
-  if( g_bTestVirtualParts )
-  {
-    if( !bHadamard )
-      rcDP.DistFunc = TComRdCost::xGetMaskedSAD;
-    else
-      rcDP.DistFunc = TComRdCost::xGetMaskedHADs;
+  if( m_bUseMask )
+  {
+    rcDP.DistFunc = (bHadamard)?TComRdCost::xGetMaskedHADs:TComRdCost::xGetMaskedSAD;
   }
 #endif
@@ -735 +739 @@
     {
       if( piOrg[n] != DBBP_INVALID_SHORT )
+      {
         uiSum += abs( piOrg[n] - piCur[n] );
+      }
     }
     piOrg += iStrideOrg;
@@ -775 +781 @@
         {
           if( piOrg[x] != DBBP_INVALID_SHORT )
+          {
             uiSum += xCalcHADs8x8( &piOrg[x], &piCur[x*iStep], iStrideOrg, iStrideCur, iStep );
+          }
         }
         piOrg += iOffsetOrg;
@@ -791 +799 @@
         {
           if( piOrg[x] != DBBP_INVALID_SHORT )
+          {
             uiSum += xCalcHADs16x4( &piOrg[x], &piCur[x*iStep], iStrideOrg, iStrideCur, iStep );
+          }
         }
         piOrg += iOffsetOrg;
@@ -806 +816 @@
         {
           if( piOrg[x] != DBBP_INVALID_SHORT )
+          {
             uiSum += xCalcHADs4x16( &piOrg[x], &piCur[x*iStep], iStrideOrg, iStrideCur, iStep );
+          }
         }
         piOrg += iOffsetOrg;
@@ -823 +835 @@
         {
           if( piOrg[x] != DBBP_INVALID_SHORT )
+          {
             uiSum += xCalcHADs4x4( &piOrg[x], &piCur[x*iStep], iStrideOrg, iStrideCur, iStep );
+          }
         }
         piOrg += iOffsetOrg;
@@ -838 +852 @@
         {
           if( piOrg[x] != DBBP_INVALID_SHORT )
+          {
             uiSum += xCalcHADs2x2( &piOrg[x], &piCur[x*iStep], iStrideOrg, iStrideCur, iStep );
+          }
         }
         piOrg += iOffsetOrg;