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

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/TRenModel.cpp (modified) (3 diffs)

branches/HTM-16.2-dev/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
 }