Changeset 189 in 3DVCSoftware for trunk/source/Lib/TLibRenderer/TRenSingleModel.h

Timestamp:

18 Nov 2012, 22:11:37 (12 years ago)

Author:

tech

Message:

Reintegrated branch 4.1-dev0 Rev. 188.

File:

• trunk/source/Lib/TLibRenderer/TRenSingleModel.h (modified) (8 diffs)

trunk/source/Lib/TLibRenderer/TRenSingleModel.h

@@ -69 +69 @@
 public: 
 
-#if FIX_VIRT_DESTRUCTOR
   virtual ~TRenSingleModel() { }  
-#endif
 #if LGE_VSO_EARLY_SKIP_A0093
   virtual Void   create    ( Int iMode, Int iWidth, Int iHeight, Int iShiftPrec, Int*** aaaiSubPelShiftTable, Int iHoleMargin, Bool bUseOrgRef, Int iBlendMode, Bool bEarlySkip ) = 0;
@@ -80 +78 @@
   // Set Frame dependent data
   virtual Void   setLRView ( Int iViewPos, Pel** apiCurVideoPel, Int* aiCurVideoStride, Pel* piCurDepthPel, Int iCurDepthStride ) = 0;
-#if FIX_VSO_SETUP
   virtual Void   setupPart ( UInt uiHorOffset,       Int iUsedHeight ) = 0;
   virtual Void   setup     ( TComPicYuv* pcOrgVideo, Int** ppiShiftLutLeft, Int** ppiBaseShiftLutLeft, Int** ppiShiftLutRight,  Int** ppiBaseShiftLutRight,  Int iDistToLeft, Bool bKeepReference ) = 0;
-#else
-  virtual Void   setup     ( TComPicYuv* pcOrgVideo, Int** ppiShiftLutLeft, Int** ppiBaseShiftLutLeft, Int** ppiShiftLutRight,  Int** ppiBaseShiftLutRight,  Int iDistToLeft, Bool bKeepReference, UInt uiHorOffset ) = 0;
-#endif
 
   // Set Data
@@ -103 +97 @@
   virtual RMDist getDistVideo  ( Int iViewPos, Int iPlane, Int iStartPosX, Int iStartPosY, Int iWidth, Int iHeight, Int iStride, Pel* piNewData ) = 0;
 
-#if FIX_VSO_SETUP
   virtual Void   getSynthVideo  ( Int iViewPos, TComPicYuv* pcPicYuv ) = 0;  
   virtual Void   getSynthDepth  ( Int iViewPos, TComPicYuv* pcPicYuv ) = 0;
   virtual Void   getRefVideo    ( Int iViewPos, TComPicYuv* pcPicYuv ) = 0;
-#else
-  virtual Void   getSynthVideo  ( Int iViewPos, TComPicYuv* pcPicYuv, UInt uiHorOffset  ) = 0;  
-  virtual Void   getSynthDepth  ( Int iViewPos, TComPicYuv* pcPicYuv, UInt uiHorOffset  ) = 0;
-  virtual Void   getRefVideo    ( Int iViewPos, TComPicYuv* pcPicYuv, UInt uiHorOffset  ) = 0;
-#endif
 };
 
@@ -181 +169 @@
   // Set Frame dependent data
   Void   setLRView ( Int iViewPos, Pel** apiCurVideoPel, Int* aiCurVideoStride, Pel* piCurDepthPel, Int iCurDepthStride );
-#if FIX_VSO_SETUP
   Void   setupPart ( UInt uiHorOffset,       Int uiUsedHeight );
   Void   setup     ( TComPicYuv* pcOrgVideo, Int** ppiShiftLutLeft, Int** ppiBaseShiftLutLeft, Int** ppiShiftLutRight,  Int** ppiBaseShiftLutRight,  Int iDistToLeft, Bool bKeepReference );
-#else
-  Void   setup     ( TComPicYuv* pcOrgVideo, Int** ppiShiftLutLeft, Int** ppiBaseShiftLutLeft, Int** ppiShiftLutRight,  Int** ppiBaseShiftLutRight,  Int iDistToLeft, Bool bKeepReference, UInt uiHorOffset );
-#endif
 
 #if LGE_VSO_EARLY_SKIP_A0093
@@ -203 +187 @@
   RMDist getDistVideo  ( Int iViewPos, Int iPlane, Int iStartPosX, Int iStartPosY, Int iWidth, Int iHeight, Int iStride, Pel* piNewData );
 
-#if FIX_VSO_SETUP
   Void   getSynthVideo  ( Int iViewPos, TComPicYuv* pcPicYuv );  
   Void   getSynthDepth  ( Int iViewPos, TComPicYuv* pcPicYuv );
   Void   getRefVideo    ( Int iViewPos, TComPicYuv* pcPicYuv );
-#else
-  Void   getSynthVideo  ( Int iViewPos, TComPicYuv* pcPicYuv, UInt uiHorOffset );  
-  Void   getSynthDepth  ( Int iViewPos, TComPicYuv* pcPicYuv, UInt uiHorOffset  );
-  Void   getRefVideo    ( Int iViewPos, TComPicYuv* pcPicYuv, UInt uiHorOffset  );
-#endif
 
 private:
@@ -293 +271 @@
   Void            xInitSampleStructs           ();
   Void            xSetStructSynthViewAsRefView ();
-#if FIX_VSO_SETUP
   Void            xCopy2PicYuv                ( Pel** ppiSrcVideoPel, Int* piStrides, TComPicYuv* rpcPicYuvTarget );
-#else
-  Void            xCopy2PicYuv                ( Pel** ppiSrcVideoPel, Int* piStrides, TComPicYuv* rpcPicYuvTarget, UInt uiHorOffset );
-#endif
 
   template< typename S, typename T> 
   Void   xCopyFromSampleStruct ( S* ptSource , Int iSourceStride, T S::* ptSourceElement, T* ptTarget, Int iTargetStride, Int iWidth, Int iHeight )
   {
-#if FIX_VSO_SETUP
     AOT( iWidth != m_iWidth ); 
     for (Int iPosY = 0; iPosY < iHeight; iPosY++)
-#else
-    for (Int iPosY = 0; iPosY < m_iHeight; iPosY++)
-#endif
     {
       for (Int iPosX = 0; iPosX < m_iWidth; iPosX++)
@@ -321 +291 @@
   Void   xCopyToSampleStruct ( T* ptSource , Int iSourceStride, S* ptTarget, Int iTargetStride, T S::* ptSourceElement, Int iWidth, Int iHeight )
   {
-#if FIX_VSO_SETUP
     AOT( iWidth != m_iWidth ); 
     for (Int iPosY = 0; iPosY < iHeight; iPosY++)
-#else
-    for (Int iPosY = 0; iPosY < m_iHeight; iPosY++)
-#endif
     {
       for (Int iPosX = 0; iPosX < m_iWidth; iPosX++)
@@ -344 +310 @@
   Int   m_iStride;
   Int   m_iPad;
-#if FIX_VSO_SETUP
   Int   m_iUsedHeight;
   Int   m_iHorOffset; 
-#endif
 
   Int   m_iSampledWidth;
-#if FIX_VSO_SETUP
-#else
-  Int   m_iSampledHeight;
-#endif
   Int   m_iSampledStride;