Changeset 1413 in 3DVCSoftware for trunk/source/Lib/TLibRenderer

Timestamp:

11 Jul 2018, 15:19:49 (7 years ago)

Author:

tech

Message:

Merged HTM-16.2-dev@1412

Location:

trunk/source/Lib/TLibRenderer

Files:

• TRenModel.cpp (modified) (3 diffs)
• TRenSingleModel.cpp (modified) (6 diffs)
• TRenSingleModel.h (modified) (6 diffs)

trunk/source/Lib/TLibRenderer/TRenModel.cpp

@@ -418 +418 @@
 
 #if H_3D_VSO_EARLY_SKIP
-#if RM_INIT_FIX
   m_apcRenModels[iModelNum]->create( iMode ,m_iWidth, m_iHeight, m_iShiftPrec, m_aaaiSubPelShiftLut, m_iHoleMargin,  bUseOrgRef, ( iMode != 2 )  ? BLEND_NONE : iBlendMode , m_bLimOutput, m_bEarlySkip );
+
 #else
-  m_apcRenModels[iModelNum]->create( iMode ,m_iWidth, m_iHeight, m_iShiftPrec, m_aaaiSubPelShiftLut, m_iHoleMargin,  bUseOrgRef, iBlendMode, m_bLimOutput, m_bEarlySkip );
-#endif
-
-#else
-
-#if RM_INIT_FIX
   m_apcRenModels[iModelNum]->create( iMode ,m_iWidth, m_iHeight, m_iShiftPrec, m_aaaiSubPelShiftLut, m_iHoleMargin,  bUseOrgRef, ( iMode != 2 )  ? BLEND_NONE : iBlendMode, m_bLimOutput );
-#else
-  m_apcRenModels[iModelNum]->create( iMode ,m_iWidth, m_iHeight, m_iShiftPrec, m_aaaiSubPelShiftLut, m_iHoleMargin,  bUseOrgRef, iBlendMode, m_bLimOutput );
-#endif
 #endif
 
@@ -507 +498 @@
 
   // Render
-#if !RM_FIX_SETUP
-  m_apcRenModels[iModelNum]->setupLutAndRef(  pcPicYuvRefView, ppiShiftLutLeft, ppiBaseShiftLutLeft, ppiShiftLutRight, ppiBaseShiftLutRight, iDistToLeft, bAnyRefFromOrg );
-
-  // Setup with actual data  
-    for (Int iBaseViewIdx = 0; iBaseViewIdx < m_iNumOfBaseViews; iBaseViewIdx++ )
-    {
-      if ( m_aaeBaseViewPosInModel[iBaseViewIdx][iModelNum] != VIEWPOS_INVALID )
-      {
-        m_apcRenModels[iModelNum]->setLRView(
-          m_aaeBaseViewPosInModel[iBaseViewIdx][iModelNum],
-          m_aapiCurVideoPel      [iBaseViewIdx],
-          m_aaiCurVideoStrides   [iBaseViewIdx],
-          m_apiCurDepthPel       [iBaseViewIdx],
-          m_aiCurDepthStrides    [iBaseViewIdx]
-        );
-      }
-    }
-  // Render initial state
-  AOT( m_bLimOutput && m_aaeBaseViewPosInModel[ iEncViewSIdx ][iModelNum] == VIEWPOS_INVALID );
-  m_apcRenModels[iModelNum]->setupInitialState( m_bLimOutput ? m_aaeBaseViewPosInModel[ iEncViewSIdx ][iModelNum] : VIEWPOS_INVALID );  
-
-#else
   m_apcRenModels[iModelNum]->setupLut(  ppiShiftLutLeft, ppiBaseShiftLutLeft, ppiShiftLutRight, ppiBaseShiftLutRight, iDistToLeft );
   
@@ -587 +556 @@
     m_apcRenModels[iModelNum]->setLimOutStruct( (curViewPosInModel == VIEWPOS_RIGHT)  ? VIEWPOS_LEFT : VIEWPOS_RIGHT );
   }  
-#endif
 }
 

trunk/source/Lib/TLibRenderer/TRenSingleModel.cpp

@@ -246 +246 @@
 
 
-#if !RM_FIX_SETUP
-template <BlenMod iBM, Bool bBitInc> Void
-  TRenSingleModelC<iBM,bBitInc>::setupInitialState( Int curViewPosInModel )
-{
-  xRenderAll( );
-
-  if ( m_bLimOutput )
-  {
-    AOT( curViewPosInModel == VIEWPOS_INVALID )
-    xSetLimOutStruct( (curViewPosInModel == VIEWPOS_RIGHT)  ? VIEWPOS_LEFT : VIEWPOS_RIGHT );
-  }
-}
-#endif
-
-#if RM_FIX_SETUP
 template <BlenMod iBM, Bool bBitInc> Void
   TRenSingleModelC<iBM,bBitInc>::setupRefView      ( TComPicYuv* pcOrgVideo )
@@ -287 +272 @@
 template <BlenMod iBM, Bool bBitInc> Void
   TRenSingleModelC<iBM,bBitInc>::setupLut( Int** ppiShiftLutLeft, Int** ppiBaseShiftLutLeft, Int** ppiShiftLutRight,  Int** ppiBaseShiftLutRight,  Int iDistToLeft )
-#else
-template <BlenMod iBM, Bool bBitInc> Void
-  TRenSingleModelC<iBM,bBitInc>::setupLutAndRef( TComPicYuv* pcOrgVideo, Int** ppiShiftLutLeft, Int** ppiBaseShiftLutLeft, Int** ppiShiftLutRight,  Int** ppiBaseShiftLutRight,  Int iDistToLeft, Bool bRenderRef )
-#endif
-{
-#if !RM_FIX_SETUP
-  AOT( !m_bUseOrgRef && pcOrgVideo );
-#endif
+{
   AOT( (ppiShiftLutLeft  == NULL) && (m_iMode == 0 || m_iMode == 2) );
   AOT( (ppiShiftLutRight == NULL) && (m_iMode == 1 || m_iMode == 2) );
@@ -306 +284 @@
     TRenFilter<REN_BIT_DEPTH>::setupZLUT( true, 30, iDistToLeft, ppiBaseShiftLutLeft, ppiBaseShiftLutRight, m_iBlendZThres, m_iBlendDistWeight, m_piInvZLUTLeft, m_piInvZLUTRight );
   }
-
-#if !RM_FIX_SETUP
-  // Copy Reference
-  m_pcPicYuvRef = pcOrgVideo;
-
-  if ( pcOrgVideo )
-  {
-    assert( pcOrgVideo->getChromaFormat() == CHROMA_420 );     
-
-    TRenFilter<REN_BIT_DEPTH>::copy(             pcOrgVideo->getAddr( COMPONENT_Y  ) +  m_iHorOffset       * pcOrgVideo->getStride( COMPONENT_Y  ), pcOrgVideo->getStride( COMPONENT_Y  ), m_iWidth,      m_iUsedHeight,      m_aapiRefVideoPel[0], m_aiRefVideoStrides[0]);
-    TRenFilter<REN_BIT_DEPTH>::sampleCUpHorUp(0, pcOrgVideo->getAddr( COMPONENT_Cb ) + (m_iHorOffset >> 1) * pcOrgVideo->getStride( COMPONENT_Cb ), pcOrgVideo->getStride( COMPONENT_Cb ), m_iWidth >> 1, m_iUsedHeight >> 1, m_aapiRefVideoPel[1], m_aiRefVideoStrides[1]);
-    TRenFilter<REN_BIT_DEPTH>::sampleCUpHorUp(0, pcOrgVideo->getAddr( COMPONENT_Cr ) + (m_iHorOffset >> 1) * pcOrgVideo->getStride( COMPONENT_Cr ), pcOrgVideo->getStride( COMPONENT_Cr ), m_iWidth >> 1, m_iUsedHeight >> 1, m_aapiRefVideoPel[2], m_aiRefVideoStrides[2]);    
-    xSetStructRefView();
-  }
-  else
-  {
-    if ( bRenderRef )
-    {    
-      xRenderAll( ); 
-      xSetStructSynthViewAsRefView();
-    }
-  }
-#endif
-}
-
-template <BlenMod iBM, Bool bBitInc> Void
-#if RM_FIX_SETUP
+}
+
+template <BlenMod iBM, Bool bBitInc> Void
 TRenSingleModelC<iBM,bBitInc>::renderAll( )
-#else
-TRenSingleModelC<iBM,bBitInc>::xRenderAll( )
-#endif
 {
   // Initial Rendering
-#if RM_FIX_SETUP
   resetStructError();
-#else
-  xResetStructError();
-#endif
   xInitSampleStructs();
   switch ( m_iMode )
@@ -465 +412 @@
 
 template <BlenMod iBM, Bool bBitInc> Void
-#if RM_FIX_SETUP
 TRenSingleModelC<iBM,bBitInc>::resetStructError( )
-#else
-TRenSingleModelC<iBM,bBitInc>::xResetStructError( )
-#endif
 {
   RenModelOutPels* pcCurOutSampleRow = m_pcOutputSamples;
@@ -484 +427 @@
 
 template <BlenMod iBM, Bool bBitInc> Void
-#if RM_FIX_SETUP
   TRenSingleModelC<iBM,bBitInc>::setLimOutStruct(Int iSourceViewPos )
-#else
-  TRenSingleModelC<iBM,bBitInc>::xSetLimOutStruct(Int iSourceViewPos )
-#endif
 {  
   RM_AOF( m_bLimOutput ); 
@@ -537 +476 @@
 
 template <BlenMod iBM, Bool bBitInc> Void
-#if RM_FIX_SETUP
 TRenSingleModelC<iBM,bBitInc>::setStructSynthViewAsRefView( )
-#else
-TRenSingleModelC<iBM,bBitInc>::xSetStructSynthViewAsRefView( )
-#endif
 {
   AOT( m_iMode < 0 || m_iMode > 2);

trunk/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 );