Changeset 1412 in 3DVCSoftware for branches/HTM-16.2-dev/source/Lib/TLibRenderer/TRenSingleModel.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/TRenSingleModel.cpp (modified) (6 diffs)

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