Changeset 1072 in 3DVCSoftware for branches/HTM-12.1-MV-draft-1/source/Lib/TAppCommon/TAppComCamPara.h

Timestamp:

13 Oct 2014, 16:44:51 (11 years ago)

Author:

tech

Message:

Removed 3D-HEVC related integrations.

File:

• branches/HTM-12.1-MV-draft-1/source/Lib/TAppCommon/TAppComCamPara.h (modified) (4 diffs)

branches/HTM-12.1-MV-draft-1/source/Lib/TAppCommon/TAppComCamPara.h

@@ -67 +67 @@
   Bool                m_bCamParsCodedPrecSet;                 ///< Coded Cam Para precision set for current frame;
   
-#if H_3D_REN_MAX_DEV_OUT
-  Double              m_dMaxShiftDeviation;                   ///< Maximum deviation of shifts with integer precision compare to double precision
-#endif
   //SAIT_VSO_EST_A0033
   Double              m_dDispCoeff;
@@ -125 +122 @@
   Bool  xGetLeftRightView         ( Int iView, std::vector<Int> aiSortedViews, Int& riLeftView, Int& riRightView, Int& riLeftSortedViewIdx, Int& riRightSortedViewIdx );
   Void  xGetPrevAndNextBaseView   ( Int iSourceViewNum, Int iTargetViewNum, Int& riPrevBaseViewNum, Int& riNextBaseViewNum );
-#if !KWU_RC_MADPRED_E0227
   Void  xGetZNearZFar             ( Int iView, UInt uiFrame, Double& rdZNear, Double& rdZFar );
   Void  xGetGeometryData          ( Int dView, UInt uiFrame, Double& rdFocalLength, Double& rdPosition, Double& rdCameraShift, Bool& rbInterpolated );
-#endif
   Void  xSetupBaseViewsFromCoded  ();
   Void  xSetupBaseViews           ( Char* pchBaseViewNumbers, UInt uiNumBaseViews );
@@ -186 +181 @@
   UInt                getCurFrameId             ()  { return m_iCurrentFrameId;   }
   static Void         convertNumberString       ( Char* pchViewNumberString, std::vector<Int>& raiViewNumbers, Double dViewNumPrec );
-#if H_3D_REN_MAX_DEV_OUT
-  Double              getMaxShiftDeviation      () { return m_dMaxShiftDeviation; }; 
-#endif
-
-#if H_3D_VSO
-  // SAIT_VSO_EST_A033
-  Void                setDispCoeff              ( UInt uiStartFrameId, Int iViewIdx );
-  Double              getDispCoeff              () { return m_dDispCoeff; }
-#endif
+
 
   // function for getting parameters and parameter arrays
@@ -220 +207 @@
   Int**               getCodedOffset            ()  { return m_aaiCodedOffset;          }
 
-#if KWU_RC_MADPRED_E0227
-  Void  xGetZNearZFar             ( Int iView, UInt uiFrame, Double& rdZNear, Double& rdZFar );
-  Void  xGetGeometryData          ( Int dView, UInt uiFrame, Double& rdFocalLength, Double& rdPosition, Double& rdCameraShift, Bool& rbInterpolated );
-#endif
 };