Changeset 1341 in SHVCSoftware for branches/SHM-dev

Timestamp:

22 Jul 2015, 02:55:02 (9 years ago)

Author:

seregin

Message:

port rev 4419

Location:

branches/SHM-dev/source/Lib/TLibCommon

Files:

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

branches/SHM-dev/source/Lib/TLibCommon/TComRdCost.cpp

@@ -250 +250 @@
   m_afpDistortFunc[DF_SADS16N] = TComRdCost::xGetSAD16N;
 
-#if AMP_SAD
   m_afpDistortFunc[DF_SAD12  ] = TComRdCost::xGetSAD12;
   m_afpDistortFunc[DF_SAD24  ] = TComRdCost::xGetSAD24;
@@ -258 +257 @@
   m_afpDistortFunc[DF_SADS24 ] = TComRdCost::xGetSAD24;
   m_afpDistortFunc[DF_SADS48 ] = TComRdCost::xGetSAD48;
-#endif
+
   m_afpDistortFunc[DF_HADS   ] = TComRdCost::xGetHADs;
   m_afpDistortFunc[DF_HADS4  ] = TComRdCost::xGetHADs;
@@ -319 +318 @@
   rcDistParam.DistFunc = m_afpDistortFunc[DF_SAD + g_aucConvertToBit[ rcDistParam.iCols ] + 1 ];
 
-#if AMP_SAD
   if (rcDistParam.iCols == 12)
   {
@@ -332 +330 @@
     rcDistParam.DistFunc = m_afpDistortFunc[DF_SAD48];
   }
-#endif
 
   // initialize
@@ -359 +356 @@
   {
     rcDistParam.DistFunc = m_afpDistortFunc[DF_SADS + g_aucConvertToBit[ rcDistParam.iCols ] + 1 ];
-#if AMP_SAD
     if (rcDistParam.iCols == 12)
     {
@@ -372 +368 @@
       rcDistParam.DistFunc = m_afpDistortFunc[DF_SADS48];
     }
-#endif
   }
   else
@@ -601 +596 @@
 }
 
-#if AMP_SAD
 Distortion TComRdCost::xGetSAD12( DistParam* pcDtParam )
 {
@@ -640 +634 @@
   return ( uiSum >> DISTORTION_PRECISION_ADJUSTMENT(pcDtParam->bitDepth-8) );
 }
-#endif
 
 Distortion TComRdCost::xGetSAD16N( DistParam* pcDtParam )
@@ -743 +736 @@
 }
 
-#if AMP_SAD
 Distortion TComRdCost::xGetSAD24( DistParam* pcDtParam )
 {
@@ -794 +786 @@
   return ( uiSum >> DISTORTION_PRECISION_ADJUSTMENT(pcDtParam->bitDepth-8) );
 }
-
-#endif
 
 Distortion TComRdCost::xGetSAD64( DistParam* pcDtParam )
@@ -888 +878 @@
 }
 
-#if AMP_SAD
 Distortion TComRdCost::xGetSAD48( DistParam* pcDtParam )
 {
@@ -963 +952 @@
   return ( uiSum >> DISTORTION_PRECISION_ADJUSTMENT(pcDtParam->bitDepth-8) );
 }
-#endif
 
 // --------------------------------------------------------------------------------------------------------------------

branches/SHM-dev/source/Lib/TLibCommon/TComRdCost.h

@@ -207 +207 @@
   static Distortion xGetSAD16N        ( DistParam* pcDtParam );
 
-#if AMP_SAD
   static Distortion xGetSAD12         ( DistParam* pcDtParam );
   static Distortion xGetSAD24         ( DistParam* pcDtParam );
   static Distortion xGetSAD48         ( DistParam* pcDtParam );
-
-#endif
 
   static Distortion xGetHADs          ( DistParam* pcDtParam );

branches/SHM-dev/source/Lib/TLibCommon/TypeDef.h

@@ -162 +162 @@
 // ====================================================================================================================
 
-#define AMP_SAD                                           1 ///< dedicated SAD functions for AMP
 #define DECODER_CHECK_SUBSTREAM_AND_SLICE_TRAILING_BYTES  1
 #define RDO_WITHOUT_DQP_BITS                              0 ///< Disable counting dQP bits in RDO-based mode decision
@@ -453 +452 @@
   DF_HADS16N         = 28,     ///< 16NxM HAD with step
 
-#if AMP_SAD
   DF_SAD12           = 43,
   DF_SAD24           = 44,
@@ -464 +462 @@
   DF_SSE_FRAME       = 50,     ///< Frame-based SSE
   DF_TOTAL_FUNCTIONS = 64
-#else
-  DF_SSE_FRAME       = 32,     ///< Frame-based SSE
-  DF_TOTAL_FUNCTIONS = 33
-#endif
 };