Changeset 1413 in 3DVCSoftware for trunk/source/Lib/TLibRenderer/TRenModel.cpp


Ignore:
Timestamp:
11 Jul 2018, 15:19:49 (6 years ago)
Author:
tech
Message:

Merged HTM-16.2-dev@1412

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/source/Lib/TLibRenderer/TRenModel.cpp

    r1405 r1413  
    418418
    419419#if H_3D_VSO_EARLY_SKIP
    420 #if RM_INIT_FIX
    421420  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 );
     421
    422422#else
    423   m_apcRenModels[iModelNum]->create( iMode ,m_iWidth, m_iHeight, m_iShiftPrec, m_aaaiSubPelShiftLut, m_iHoleMargin,  bUseOrgRef, iBlendMode, m_bLimOutput, m_bEarlySkip );
    424 #endif
    425 
    426 #else
    427 
    428 #if RM_INIT_FIX
    429423  m_apcRenModels[iModelNum]->create( iMode ,m_iWidth, m_iHeight, m_iShiftPrec, m_aaaiSubPelShiftLut, m_iHoleMargin,  bUseOrgRef, ( iMode != 2 )  ? BLEND_NONE : iBlendMode, m_bLimOutput );
    430 #else
    431   m_apcRenModels[iModelNum]->create( iMode ,m_iWidth, m_iHeight, m_iShiftPrec, m_aaaiSubPelShiftLut, m_iHoleMargin,  bUseOrgRef, iBlendMode, m_bLimOutput );
    432 #endif
    433424#endif
    434425
     
    507498
    508499  // Render
    509 #if !RM_FIX_SETUP
    510   m_apcRenModels[iModelNum]->setupLutAndRef(  pcPicYuvRefView, ppiShiftLutLeft, ppiBaseShiftLutLeft, ppiShiftLutRight, ppiBaseShiftLutRight, iDistToLeft, bAnyRefFromOrg );
    511 
    512   // Setup with actual data 
    513     for (Int iBaseViewIdx = 0; iBaseViewIdx < m_iNumOfBaseViews; iBaseViewIdx++ )
    514     {
    515       if ( m_aaeBaseViewPosInModel[iBaseViewIdx][iModelNum] != VIEWPOS_INVALID )
    516       {
    517         m_apcRenModels[iModelNum]->setLRView(
    518           m_aaeBaseViewPosInModel[iBaseViewIdx][iModelNum],
    519           m_aapiCurVideoPel      [iBaseViewIdx],
    520           m_aaiCurVideoStrides   [iBaseViewIdx],
    521           m_apiCurDepthPel       [iBaseViewIdx],
    522           m_aiCurDepthStrides    [iBaseViewIdx]
    523         );
    524       }
    525     }
    526   // Render initial state
    527   AOT( m_bLimOutput && m_aaeBaseViewPosInModel[ iEncViewSIdx ][iModelNum] == VIEWPOS_INVALID );
    528   m_apcRenModels[iModelNum]->setupInitialState( m_bLimOutput ? m_aaeBaseViewPosInModel[ iEncViewSIdx ][iModelNum] : VIEWPOS_INVALID ); 
    529 
    530 #else
    531500  m_apcRenModels[iModelNum]->setupLut(  ppiShiftLutLeft, ppiBaseShiftLutLeft, ppiShiftLutRight, ppiBaseShiftLutRight, iDistToLeft );
    532501 
     
    587556    m_apcRenModels[iModelNum]->setLimOutStruct( (curViewPosInModel == VIEWPOS_RIGHT)  ? VIEWPOS_LEFT : VIEWPOS_RIGHT );
    588557  } 
    589 #endif
    590558}
    591559
Note: See TracChangeset for help on using the changeset viewer.