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

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

@@ -58 +58 @@
 #include "TEncAnalyze.h"
 #include "TEncRateCtrl.h"
-#if KWU_RC_MADPRED_E0227
-#include "../App/TAppEncoder/TAppEncTop.h"
-#endif
 #include <vector>
 
@@ -127 +124 @@
   Int                     m_layerId;  
   Int                     m_viewId;
-#if NH_3D
-  Int                     m_viewIndex; 
-  Bool                    m_isDepth;
-#endif
-#endif
-#if NH_3D_IC
-  Int*                    m_aICEnableCandidate; 
-  Int*                    m_aICEnableNum; 
 #endif
   //--Adaptive Loop filter
@@ -176 +165 @@
   Int       getLayerId       ()                 { return m_layerId;    }  
   Int       getViewId        ()                 { return m_viewId;    }
-#if NH_3D
-  Int       getViewIndex     ()                 { return m_viewIndex;    }
-  Bool      getIsDepth       ()                 { return m_isDepth; }
-#endif
 #endif
 
@@ -186 +171 @@
   TComList<TComPic*>*   getListPic()      { return m_pcListPic; }
   Void  printOutSummary      ( UInt uiNumAllPicCoded, Bool isField, const Bool printMSEBasedSNR, const Bool printSequenceMSE, const BitDepths &bitDepths );
-#if NH_3D_VSO
-  Void  preLoopFilterPicAll  ( TComPic* pcPic, Dist64& ruiDist);
-#else
   Void  preLoopFilterPicAll  ( TComPic* pcPic, UInt64& ruiDist );
-#endif
-
-#if KWU_RC_MADPRED_E0227
-  TEncTop* getEncTop() { return m_pcEncTop; }
-#endif
+
 
   TEncSlice*  getSliceEncoder()   { return m_pcSliceEncoder; }
@@ -213 +191 @@
                                      TComPicYuv* pcPicRecFirstField, TComPicYuv* pcPicRecSecondField,
                                      const InputColourSpaceConversion snr_conversion, const Bool printFrameMSE );
-#if NH_3D_VSO
-  Dist64 xFindDistortionFrame (TComPicYuv* pcPic0, TComPicYuv* pcPic1, const BitDepths &bitDepths);
-#else  
   UInt64 xFindDistortionFrame (TComPicYuv* pcPic0, TComPicYuv* pcPic1, const BitDepths &bitDepths);
-#endif
   Double xCalculateRVM();