Changeset 1412 in 3DVCSoftware for branches/HTM-16.2-dev/source/Lib/TLibRenderer/TRenSingleModel.h

Timestamp:

12 Apr 2018, 11:12:21 (7 years ago)

Author:

tech

Message:

• Update HM-16.18
• Cleanups
• Encoder Extension

-- Representation formats
-- Parameter set sharing
-- GOP configuration

File:

• branches/HTM-16.2-dev/source/Lib/TLibRenderer/TRenSingleModel.h (modified) (6 diffs)

branches/HTM-16.2-dev/source/Lib/TLibRenderer/TRenSingleModel.h

@@ -78 +78 @@
   virtual Void   setLRView         ( Int iViewPos, Pel** apiCurVideoPel, Int* aiCurVideoStride, Pel* piCurDepthPel, Int iCurDepthStride ) = 0;
   virtual Void   setupPart         ( UInt uiHorOffset,       Int iUsedHeight ) = 0;
-#if RM_FIX_SETUP
+
   virtual Void   setupLut          ( Int** ppiShiftLutLeft, Int** ppiBaseShiftLutLeft, Int** ppiShiftLutRight, Int** ppiBaseShiftLutRight, Int iDistToLeft ) = 0;
   virtual Void   setupRefView      ( TComPicYuv* pcOrgVideo ) = 0;
@@ -86 +86 @@
   virtual Void   resetStructError            ()                     = 0;
   virtual Void   setLimOutStruct             ( Int iSourceViewPos ) = 0; 
-#else
-  virtual Void   setupLutAndRef    ( TComPicYuv* pcOrgVideo, Int** ppiShiftLutLeft, Int** ppiBaseShiftLutLeft, Int** ppiShiftLutRight, Int** ppiBaseShiftLutRight, Int iDistToLeft, Bool bRenderRef ) = 0;
-  virtual Void   setupInitialState ( Int curViewPosInModel ) = 0;
-#endif
 
   // Set Data
@@ -195 +191 @@
   Void   setLRView         ( Int iViewPos, Pel** apiCurVideoPel, Int* aiCurVideoStride, Pel* piCurDepthPel, Int iCurDepthStride );  
   Void   setupPart         ( UInt uiHorOffset,       Int uiUsedHeight ); 
-#if RM_FIX_SETUP
+
   Void   setupLut          (  Int** ppiShiftLutLeft, Int** ppiBaseShiftLutLeft, Int** ppiShiftLutRight, Int** ppiBaseShiftLutRight, Int iDistToLeft);
   Void   setupRefView      ( TComPicYuv* pcOrgVideo );
@@ -203 +199 @@
   Void              resetStructError            ();
   Void              setLimOutStruct             ( Int iSourceViewPos ); 
-#else
-  Void   setupLutAndRef    ( TComPicYuv* pcOrgVideo, Int** ppiShiftLutLeft, Int** ppiBaseShiftLutLeft, Int** ppiShiftLutRight, Int** ppiBaseShiftLutRight, Int iDistToLeft, Bool bRenderRef );
-  Void   setupInitialState ( Int curViewPosInModel );
-#endif
 
 
@@ -229 +221 @@
 
 private:
-
-#if !RM_FIX_SETUP
-   __inline Void  xRenderAll( );
-#endif
 
 
@@ -310 +298 @@
        
   Void            xSetStructRefView            ();
-#if !RM_FIX_SETUP
-  Void            xResetStructError            ();
-  Void            xSetLimOutStruct             (Int iSourceViewPos ); 
-#endif
-  
   Void            xInitSampleStructs           ();
-#if !RM_FIX_SETUP
-  Void            xSetStructSynthViewAsRefView ();
-#endif
   Void            xCopy2PicYuv                ( Pel** ppiSrcVideoPel, Int* piStrides, TComPicYuv* rpcPicYuvTarget );