Changeset 1325 in 3DVCSoftware for branches/HTM-15.1-MV-draft-4/source/Lib/TLibEncoder/TEncSearch.h

Timestamp:

7 Sep 2015, 18:40:35 (10 years ago)

Author:

tech

Message:

Removed 3D-HEVC.

File:

• branches/HTM-15.1-MV-draft-4/source/Lib/TLibEncoder/TEncSearch.h (modified) (12 diffs)

branches/HTM-15.1-MV-draft-4/source/Lib/TLibEncoder/TEncSearch.h

@@ -118 +118 @@
   const UInt*     m_puiDFilter;
 
-#if NH_3D_VSO // M17
-  TComYuv         m_cYuvRecTemp; 
-#endif
   // AMVP cost computation
   // UInt            m_auiMVPIdxCost[AMVP_MAX_NUM_CANDS+1][AMVP_MAX_NUM_CANDS];
@@ -183 +180 @@
                                   Pel         resiLuma[NUMBER_OF_STORED_RESIDUAL_TYPES][MAX_CU_SIZE * MAX_CU_SIZE]
                                   DEBUG_STRING_FN_DECLARE(sDebug)
-#if NH_3D_ENC_DEPTH
-                                , Bool        bOnlyIVP
-#endif
                                 );
 
@@ -195 +189 @@
                                   Pel         resiLuma[NUMBER_OF_STORED_RESIDUAL_TYPES][MAX_CU_SIZE * MAX_CU_SIZE]
                                   DEBUG_STRING_FN_DECLARE(sDebug));
-#if NH_3D_DIS
-  Void  estIntraPredDIS        ( TComDataCU* pcCU, 
-                                 TComYuv*    pcOrgYuv, 
-                                 TComYuv*    pcPredYuv, 
-                                 TComYuv*    pcResiYuv, 
-                                 TComYuv*    pcRecoYuv,
-                                 UInt&       ruiDistC,
-                                 Bool        bLumaOnly );
-#endif  
 
   /// encoder estimation - inter prediction (non-skip)
@@ -212 +197 @@
                                   TComYuv*    pcRecoYuv
                                   DEBUG_STRING_FN_DECLARE(sDebug),
-#if NH_3D_FAST_TEXTURE_ENCODING
-                                  Bool        bFMD,
-#endif
                                   Bool        bUseRes = false
 #if AMP_MRG
@@ -230 +212 @@
                                   Bool        bSkipResidual
                                   DEBUG_STRING_FN_DECLARE(sDebug) );
-#if NH_3D_SDC_INTER
-  Void encodeResAndCalcRdInterSDCCU( TComDataCU* pcCU,
-                                     TComYuv* pcOrg, 
-                                     TComYuv* pcPred, 
-                                     TComYuv* pcResi, 
-                                     TComYuv* pcRec, 
-                                     Int      uiOffset,
-                                     const UInt uiDepth );
-#endif
 
   /// set ME search range
@@ -277 +250 @@
                                           Pel           resiLuma[NUMBER_OF_STORED_RESIDUAL_TYPES][MAX_CU_SIZE * MAX_CU_SIZE],
                                     const Bool          checkCrossCPrediction,
-#if NH_3D_VSO
-                                    Dist&        ruiDist,
-#else
                                     Distortion&   ruiDist,
-#endif
 const ComponentID   compID,
                                           TComTU        &rTu
                                     DEBUG_STRING_FN_DECLARE(sTest)
                                          ,Int           default0Save1Load2 = 0
-#if NH_3D_ENC_DEPTH
-                                  , Bool          zeroResiFlag = false
-#endif
                                    );
 
@@ -295 +261 @@
                                     TComYuv*    pcResiYuv,
                                     Pel         resiLuma[NUMBER_OF_STORED_RESIDUAL_TYPES][MAX_CU_SIZE * MAX_CU_SIZE],
-#if NH_3D_VSO
-                                    Dist&        ruiDistY,
-#else
                                     Distortion& ruiDistY,
-#endif
 #if HHI_RQT_INTRA_SPEEDUP
                                     Bool         bCheckFirst,
@@ -306 +268 @@
                                     TComTU      &rTu
                                     DEBUG_STRING_FN_DECLARE(sDebug)
-#if NH_3D_ENC_DEPTH
-                                  , Bool        zeroResiFlag = false
-#endif
                                   );
 
@@ -335 +294 @@
                                     TComYuv*    pcResiYuv,
                                     Pel         resiLuma[NUMBER_OF_STORED_RESIDUAL_TYPES][MAX_CU_SIZE * MAX_CU_SIZE],
-#if NH_3D_VSO
-                                    Dist&       ruiDist,
-#else
                                     Distortion& ruiDist,
-#endif
                                     TComTU      &rTu
                                     DEBUG_STRING_FN_DECLARE(sDebug));
@@ -347 +302 @@
   Void  xStoreIntraResultQT       ( const ComponentID compID, TComTU &rTu);
   Void  xLoadIntraResultQT        ( const ComponentID compID, TComTU &rTu);
-#if NH_3D_DIS
-  Void xIntraCodingDIS           ( TComDataCU* pcCU, UInt uiAbsPartIdx, TComYuv* pcOrgYuv, TComYuv* pcPredYuv, Dist& ruiDist, Double& dRDCost, UInt uiPredMode );
-#endif
-
-#if NH_3D_DMM
-  // -------------------------------------------------------------------------------------------------------------------
-  // Depth intra search
-  // -------------------------------------------------------------------------------------------------------------------
-
-  Void xCalcBiSegDCs              ( Pel* ptrSrc, UInt srcStride, Bool* biSegPattern, Int patternStride, Pel& valDC1, Pel& valDC2, Pel defaultVal, Bool subSamp = false );
-  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
-  Void xIntraCodingSDC            ( TComDataCU* pcCU, UInt uiAbsPartIdx, TComYuv* pcOrgYuv, TComYuv* pcPredYuv, Dist& ruiDist, Double& dRDCost, Bool bZeroResidual, Int iSDCDeltaResi    );
-  Void xCalcConstantSDC           ( Pel* ptrSrc, UInt srcStride, UInt uiSize, Pel& valDC );
-#endif
+
 
 
@@ -416 +355 @@
                                     UChar*       uhInterDirNeighbours,
                                     Int&         numValidMergeCand
-#if NH_3D_VSP
-                                  , Int* vspFlag
-#endif
-#if NH_3D_SPIVMP
-                                  , Bool* pbSPIVMPFlag, TComMvField* pcMvFieldSP, UChar* puhInterDirSP
-#endif
                                    );
 
@@ -512 +445 @@
 
   Void xEncodeInterResidualQT( const ComponentID compID, TComTU &rTu );
-#if NH_3D_VSO // M26
-  Void xEstimateInterResidualQT( TComYuv* pcResi, TComYuv* pcOrg, TComYuv* pcPred,  Double &rdCost, UInt &ruiBits, Dist       &ruiDist, Dist       *puiZeroDist, TComTU &rTu DEBUG_STRING_FN_DECLARE(sDebug) );
-#else
   Void xEstimateInterResidualQT( TComYuv* pcResi                                  , Double &rdCost, UInt &ruiBits, Distortion &ruiDist, Distortion *puiZeroDist, TComTU &rTu DEBUG_STRING_FN_DECLARE(sDebug) );
-#endif
   Void xSetInterResidualQTData( TComYuv* pcResi, Bool bSpatial, TComTU &rTu  );