Changeset 1153 in 3DVCSoftware for branches/HTM-13.1-dev1-RWTH/source

Timestamp:

27 Feb 2015, 09:17:57 (10 years ago)

Author:

rwth

Message:

• integration of K0028

Location:

branches/HTM-13.1-dev1-RWTH/source/Lib/TLibCommon

Files:

• TComRdCost.cpp (modified) (5 diffs)
• TComRdCost.h (modified) (1 diff)
• TypeDef.h (modified) (1 diff)

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

@@ -341 +341 @@
     else if( eDFunc >= DF_HADS && eDFunc <= DF_HADS16N )
     {
+#if !RWTH_DBBP_NO_SATD_K0028
       rcDistParam.DistFunc = TComRdCost::xGetMaskedHADs;
+#else
+      rcDistParam.DistFunc = TComRdCost::xGetMaskedSAD;
+#endif
     }
     else if( eDFunc >= DF_VSD && eDFunc <= DF_VSD16N )
@@ -441 +445 @@
   if( m_bUseMask )
   {
+#if !RWTH_DBBP_NO_SATD_K0028
     rcDistParam.DistFunc = (bHADME)?TComRdCost::xGetMaskedHADs:TComRdCost::xGetMaskedSAD;
+#else
+    rcDistParam.DistFunc = TComRdCost::xGetMaskedSAD;
+#endif
   }
 #endif
@@ -464 +472 @@
   if( m_bUseMask )
   {
+#if !RWTH_DBBP_NO_SATD_K0028
     rcDP.DistFunc = (bHadamard)?TComRdCost::xGetMaskedHADs:TComRdCost::xGetMaskedSAD;
+#else
+    rcDP.DistFunc = TComRdCost::xGetMaskedSAD;
+#endif
   }
 #endif
@@ -717 +729 @@
 }
 
+#if !RWTH_DBBP_NO_SATD_K0028
 UInt TComRdCost::xGetMaskedHADs( DistParam* pcDtParam )
 {
@@ -834 +847 @@
   return uiSum >> DISTORTION_PRECISION_ADJUSTMENT(pcDtParam->bitDepth-8);
 }
+#endif
 
 UInt TComRdCost::xGetMaskedVSD( DistParam* pcDtParam )

branches/HTM-13.1-dev1-RWTH/source/Lib/TLibCommon/TComRdCost.h

@@ -320 +320 @@
   static UInt xGetMaskedSSE     ( DistParam* pcDtParam );
   static UInt xGetMaskedSAD     ( DistParam* pcDtParam );
+#if !RWTH_DBBP_NO_SATD_K0028
   static UInt xGetMaskedHADs    ( DistParam* pcDtParam );
+#endif
   static UInt xGetMaskedVSD     ( DistParam* pcDtParam );
 #endif

branches/HTM-13.1-dev1-RWTH/source/Lib/TLibCommon/TypeDef.h

@@ -69 +69 @@
 
 #define MTK_I0093           1
+
+#define RWTH_DBBP_NO_SATD_K0028       1
 /////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////   MAJOR DEFINES   ///////////////////////////////////