Changeset 1412 in 3DVCSoftware for branches/HTM-16.2-dev/source/Lib/TLibCommon/TComRdCost.h

Timestamp:

12 Apr 2018, 11:12:21 (7 years ago)

Author:

tech

Message:

• Update HM-16.18
• Cleanups
• Encoder Extension

-- Representation formats
-- Parameter set sharing
-- GOP configuration

File:

• branches/HTM-16.2-dev/source/Lib/TLibCommon/TComRdCost.h (modified) (10 diffs)

branches/HTM-16.2-dev/source/Lib/TLibCommon/TComRdCost.h

@@ -4 +4 @@
  * granted under this license.
  *
- * Copyright (c) 2010-2016, ITU/ISO/IEC
+ * Copyright (c) 2010-2017, ITU/ISO/IEC
  * All rights reserved.
  *
@@ -90 +90 @@
   Int   iStrideVir;
 #endif
-#if NH_3D_IC
+#if NH_3D
   Bool  bUseIC;
-#endif
-#if NH_3D_SDC_INTER
   Bool  bUseSDCMRSAD;
 #endif
@@ -136 +134 @@
     iStrideVir = 0;
 #endif
-#if NH_3D_SDC_INTER
+#if NH_3D
     bUseSDCMRSAD = false;
 #endif
@@ -165 +163 @@
   Double                  m_motionLambda;
   Int                     m_iCostScale;
-#if NH_3D_DBBP
+#if NH_3D
   Bool                    m_bUseMask;
 #endif
@@ -204 +202 @@
   Void    setDistParam( DistParam& rcDP, Int bitDepth, const Pel* p1, Int iStride1, const Pel* p2, Int iStride2, Int iWidth, Int iHeight, Bool bHadamard = false );
 
-#if NH_3D_DBBP
+#if NH_3D
   Void    setUseMask(Bool b) { m_bUseMask = b; }
 #endif
@@ -210 +208 @@
   Distortion calcHAD(Int bitDepth, const Pel* pi0, Int iStride0, const Pel* pi1, Int iStride1, Int iWidth, Int iHeight );
 
-#if NH_3D_ENC_DEPTH
+#if NH_3D
   UInt    calcVAR(Pel* pi0, Int stride, Int width, Int height, Int cuDepth, UInt maxCuWidth );
 #endif  
@@ -242 +240 @@
   static Distortion xGetSSE64         ( DistParam* pcDtParam );
   static Distortion xGetSSE16N        ( DistParam* pcDtParam );
-#if NH_3D_IC || NH_3D_SDC_INTER
+#if NH_3D
   static UInt xGetSADic         ( DistParam* pcDtParam );
   static UInt xGetSAD4ic        ( DistParam* pcDtParam );
@@ -269 +267 @@
 #endif
 
-#if NH_3D_IC || NH_3D_SDC_INTER
+#if NH_3D
   static UInt xGetSAD12ic       ( DistParam* pcDtParam );
   static UInt xGetSAD24ic       ( DistParam* pcDtParam );
@@ -280 +278 @@
 
 
-#if NH_3D_IC || NH_3D_SDC_INTER
+#if NH_3D
   static UInt xGetHADsic          ( DistParam* pcDtParam );
 #endif
@@ -287 +285 @@
   static Distortion xCalcHADs2x2      ( const Pel *piOrg, const Pel *piCurr, Int iStrideOrg, Int iStrideCur, Int iStep );
   static Distortion xCalcHADs4x4      ( const Pel *piOrg, const Pel *piCurr, Int iStrideOrg, Int iStrideCur, Int iStep );
-  static Distortion xCalcHADs8x8      ( const Pel *piOrg, const Pel *piCurr, Int iStrideOrg, Int iStrideCur, Int iStep );
-#if NH_3D_DBBP
+  static Distortion xCalcHADs8x8      ( const Pel *piOrg, const Pel *piCurr, Int iStrideOrg, Int iStrideCur, Int iStep
+#if VECTOR_CODING__DISTORTION_CALCULATIONS && (RExt__HIGH_BIT_DEPTH_SUPPORT==0)
+                                      , Int bitDepth
+#endif
+                                      );
+#if NH_3D
   static UInt xGetMaskedSSE     ( DistParam* pcDtParam );
   static UInt xGetMaskedSAD     ( DistParam* pcDtParam );