Changeset 1325 in 3DVCSoftware for branches/HTM-15.1-MV-draft-4/source/Lib/TLibEncoder/TEncCu.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/TEncCu.h (modified) (6 diffs)

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

@@ -69 +69 @@
   TComDataCU**            m_ppcBestCU;      ///< Best CUs in each depth
   TComDataCU**            m_ppcTempCU;      ///< Temporary CUs in each depth
-#if NH_3D_ARP
-  TComDataCU**            m_ppcWeightedTempCU;
-#endif
   UChar                   m_uhTotalDepth;
 
@@ -82 +79 @@
   TComYuv**               m_ppcOrigYuv;     ///< Original Yuv for each depth
 
-#if NH_3D_DBBP
-  TComYuv**               m_ppcOrigYuvDBBP;
-#endif
   
   //  Data : encoder control
@@ -106 +100 @@
   TEncRateCtrl*           m_pcRateCtrl;
 
-#if KWU_RC_MADPRED_E0227
-  UInt                    m_LCUPredictionSAD;
-  Int                     m_addSADDepth;
-  Int                     m_temporalSAD;
-  Int                     m_spatialSAD;
-#endif
 public:
   /// copy parameters from encoder class
@@ -129 +117 @@
 
   Int   updateCtuDataISlice ( TComDataCU* pCtu, Int width, Int height );
-#if KWU_RC_MADPRED_E0227
-  UInt getLCUPredictionSAD() { return m_LCUPredictionSAD; }
-#endif
 
   Void setFastDeltaQp       ( Bool b)                 { m_bFastDeltaQP = b;         }
@@ -150 +135 @@
 
 #if AMP_MRG
-#if  NH_3D_FAST_TEXTURE_ENCODING
-  Void  xCheckRDCostInter   ( TComDataCU*& rpcBestCU, TComDataCU*& rpcTempCU, PartSize ePartSize DEBUG_STRING_FN_DECLARE(sDebug),  Bool bFMD, Bool bUseMRG = false  ) ;
-#else
   Void  xCheckRDCostInter   ( TComDataCU*& rpcBestCU, TComDataCU*& rpcTempCU, PartSize ePartSize DEBUG_STRING_FN_DECLARE(sDebug), Bool bUseMRG = false  );
-#endif
 #else
   Void  xCheckRDCostInter   ( TComDataCU*& rpcBestCU, TComDataCU*& rpcTempCU, PartSize ePartSize  );
-#endif
-#if NH_3D_DBBP
-  Void  xInvalidateOriginalSegments( TComYuv* pOrigYuv, TComYuv* pOrigYuvTemp, Bool* pMask, UInt uiValidSegment );
-  Void  xCheckRDCostInterDBBP( TComDataCU*& rpcBestCU, TComDataCU*& rpcTempCU  DEBUG_STRING_FN_DECLARE(sDebug),  Bool bUseMRG = false );
-#endif
-#if NH_3D_DIS
-  Void  xCheckRDCostDIS   ( TComDataCU*& rpcBestCU, TComDataCU*& rpcTempCU, PartSize ePartSize DEBUG_STRING_FN_DECLARE(sDebug) );
 #endif
   Void  xCheckRDCostIntra   ( TComDataCU *&rpcBestCU,
@@ -170 +144 @@
                               PartSize     ePartSize
                               DEBUG_STRING_FN_DECLARE(sDebug)
-#if NH_3D_ENC_DEPTH
-                            , Bool bOnlyIVP
-#endif
                             );
   Void  xCheckDQP           ( TComDataCU*  pcCU );