Changeset 1412 in 3DVCSoftware for branches/HTM-16.2-dev/source/Lib/TLibEncoder/TEncSearch.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/TLibEncoder/TEncSearch.h (modified) (11 diffs)

branches/HTM-16.2-dev/source/Lib/TLibEncoder/TEncSearch.h

@@ -4 +4 @@
  * granted under this license.
  *
- * Copyright (c) 2010-2016, ITU/ISO/IEC
+ * Copyright (c) 2010-2017, ITU/ISO/IEC
  * All rights reserved.
  *
@@ -178 +178 @@
                                   Pel         resiLuma[NUMBER_OF_STORED_RESIDUAL_TYPES][MAX_CU_SIZE * MAX_CU_SIZE]
                                   DEBUG_STRING_FN_DECLARE(sDebug)
-#if NH_3D_ENC_DEPTH
+#if NH_3D
                                 , Bool        bOnlyIVP
 #endif
@@ -190 +190 @@
                                   Pel         resiLuma[NUMBER_OF_STORED_RESIDUAL_TYPES][MAX_CU_SIZE * MAX_CU_SIZE]
                                   DEBUG_STRING_FN_DECLARE(sDebug));
-#if NH_3D_DIS
+#if NH_3D
   Void  estIntraPredDIS        ( TComDataCU* pcCU, 
                                  TComYuv*    pcOrgYuv, 
@@ -225 +225 @@
                                   Bool        bSkipResidual
                                   DEBUG_STRING_FN_DECLARE(sDebug) );
-#if NH_3D_SDC_INTER
+#if NH_3D
   Void encodeResAndCalcRdInterSDCCU( TComDataCU* pcCU,
                                      TComYuv* pcOrg, 
@@ -281 +281 @@
                                     DEBUG_STRING_FN_DECLARE(sTest)
                                          ,Int           default0Save1Load2 = 0
-#if NH_3D_ENC_DEPTH
+#if NH_3D
                                   , Bool          zeroResiFlag = false
 #endif
@@ -301 +301 @@
                                     TComTU      &rTu
                                     DEBUG_STRING_FN_DECLARE(sDebug)
-#if NH_3D_ENC_DEPTH
+#if NH_3D
                                   , Bool        zeroResiFlag = false
 #endif
@@ -342 +342 @@
   Void  xStoreIntraResultQT       ( const ComponentID compID, TComTU &rTu);
   Void  xLoadIntraResultQT        ( const ComponentID compID, TComTU &rTu);
-#if NH_3D_DIS
+#if NH_3D
 #if NH_3D_VSO
   Void xIntraCodingDIS           ( TComDataCU* pcCU, UInt uiAbsPartIdx, TComYuv* pcOrgYuv, TComYuv* pcPredYuv, Dist&       ruiDist, Double& dRDCost, UInt uiPredMode );
@@ -350 +350 @@
 #endif
 
-#if NH_3D_DMM
+#if NH_3D
   // -------------------------------------------------------------------------------------------------------------------
   // Depth intra search
@@ -358 +358 @@
   Void xSearchDmmDeltaDCs         ( TComDataCU* pcCU, UInt uiAbsPtIdx, Pel* piOrig, Pel* piPredic, UInt uiStride, Bool* biSegPattern, Int patternStride, UInt uiWidth, UInt uiHeight, Pel& rDeltaDC1, Pel& rDeltaDC2 );
   Void xSearchDmm1Wedge           ( TComDataCU* pcCU, UInt uiAbsPtIdx, Pel* piRef, UInt uiRefStride, UInt uiWidth, UInt uiHeight, UInt& ruiTabIdx );
-#endif
-#if NH_3D_SDC_INTRA
 #if NH_3D_VSO
   Void xIntraCodingSDC            ( TComDataCU* pcCU, UInt uiAbsPartIdx, TComYuv* pcOrgYuv, TComYuv* pcPredYuv, Dist& ruiDist      , Double& dRDCost, Bool bZeroResidual, Int iSDCDeltaResi    );
@@ -419 +417 @@
                                     UChar*       uhInterDirNeighbours,
                                     Int&         numValidMergeCand
-#if NH_3D_VSP
-                                  , Int* vspFlag
-#endif
-#if NH_3D_SPIVMP
-                                  , Bool* pbSPIVMPFlag, TComMvField* pcMvFieldSP, UChar* puhInterDirSP
+#if NH_3D
+                                  , Int*         vspFlag
+                                  , Bool*        pbSPIVMPFlag
+                                  , TComMvField* pcMvFieldSP
+                                  , UChar*       puhInterDirSP
 #endif
                                    );
@@ -476 +474 @@
                                     const Int          iSrchRng,
                                     TComMv&      rcMvSrchRngLT,
+#if !MCTS_ENC_CHECK
                                     TComMv&      rcMvSrchRngRB );
+#else
+                                    TComMv&      rcMvSrchRngRB,
+                                    const TComPattern* const pcPatternKey );
+#endif
+
+#if MCTS_ENC_CHECK
+  Void xInitTileBorders(const TComDataCU* const pcCU, TComPattern* pcPatternKey);
+#endif
 
   Void xPatternSearchFast         ( const TComDataCU* const  pcCU,