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

Timestamp:

11 Mar 2016, 16:54:51 (8 years ago)

Author:

tech

Message:

Merged HTM-16.0-dev1@1395.

File:

• trunk/source/Lib/TLibRenderer/TRenModel.cpp (modified) (8 diffs)

trunk/source/Lib/TLibRenderer/TRenModel.cpp

@@ -216 +216 @@
 Void
 #if H_3D_VSO_EARLY_SKIP
-TRenModel::create( Int iNumOfBaseViews, Int iNumOfModels, Int iWidth, Int iHeight, Int iShiftPrec, Int iHoleMargin, Bool bEarlySkip )
+TRenModel::create( Int iNumOfBaseViews, Int iNumOfModels, Int iWidth, Int iHeight, Int iShiftPrec, Int iHoleMargin, Bool bLimOutput, Bool bEarlySkip )
 #else
-TRenModel::create( Int iNumOfBaseViews, Int iNumOfModels, Int iWidth, Int iHeight, Int iShiftPrec, Int iHoleMargin )
-#endif
-{
+TRenModel::create( Int iNumOfBaseViews, Int iNumOfModels, Int iWidth, Int iHeight, Int iShiftPrec, Int iHoleMargin, Bool bLimOutput )
+#endif
+{
+  m_bLimOutput          = bLimOutput; 
+
   m_iNumOfBaseViews     = iNumOfBaseViews;
   m_iNumOfRenModels     = iNumOfModels;
@@ -416 +418 @@
 
 #if H_3D_VSO_EARLY_SKIP
-  m_apcRenModels[iModelNum]->create( iMode ,m_iWidth, m_iHeight, m_iShiftPrec, m_aaaiSubPelShiftLut, m_iHoleMargin,  bUseOrgRef, iBlendMode, m_bEarlySkip );
+#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_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
 
@@ -470 +482 @@
 
 Void
-TRenModel::setSingleModel( Int iModelNum, Int** ppiShiftLutLeft, Int** ppiBaseShiftLutLeft, Int** ppiShiftLutRight, Int** ppiBaseShiftLutRight, Int iDistToLeft, TComPicYuv* pcPicYuvRefView )
+TRenModel::setSingleModel( Int iModelNum, Int** ppiShiftLutLeft, Int** ppiBaseShiftLutLeft, Int** ppiShiftLutRight, Int** ppiBaseShiftLutRight, Int iDistToLeft, TComPicYuv* pcPicYuvRefView, Int iEncViewSIdx)
 {
   AOT( iModelNum < 0 || iModelNum > m_iNumOfRenModels );
@@ -486 +498 @@
     if ( m_aaeBaseViewPosInModel[iBaseViewIdx][iModelNum] != VIEWPOS_INVALID )
     {
-      bAnyRefFromOrg = true;
       m_apcRenModels[iModelNum]->setLRView( m_aaeBaseViewPosInModel[iBaseViewIdx][iModelNum],
         ( bSetupFromOrgVideo ? m_aapiOrgVideoPel   : m_aapiCurVideoPel   ) [iBaseViewIdx],
@@ -495 +506 @@
   }
 
-  m_apcRenModels[iModelNum]->setup     ( pcPicYuvRefView, ppiShiftLutLeft, ppiBaseShiftLutLeft, ppiShiftLutRight, ppiBaseShiftLutRight, iDistToLeft, false );
-
-  // Setup to Org
-  if ( bAnyRefFromOrg )
-  {
-    // Restore old values
+  // 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++ )
     {
@@ -514 +524 @@
       }
     }
-
-    // setup keeping reference rendered from original data
-    m_apcRenModels[iModelNum]->setup     ( pcPicYuvRefView, ppiShiftLutLeft, ppiBaseShiftLutLeft, ppiShiftLutRight, ppiBaseShiftLutRight, iDistToLeft, true );
-  }
+  // 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 );
+  
+  // Copy yuv to reference if given.
+  AOT( pcPicYuvRefView != NULL && bAnyRefFromOrg );
+  
+  if (pcPicYuvRefView )
+  {
+    m_apcRenModels[iModelNum]->setupRefView( pcPicYuvRefView );
+  }
+
+  m_apcRenModels[iModelNum]->renderAll( ); 
+
+  // pcPicYuvRefView != NULL &&  bAnyRefFromOrg --> invalid combination
+  // pcPicYuvRefView != NULL && !bAnyRefFromOrg --> distortion correct; reference view correct; current view correct
+  // pcPicYuvRefView == NULL &&  bAnyRefFromOrg --> distortion TBD    ; reference view TBD    ; current view TBD
+  // pcPicYuvRefView == NULL && !bAnyRefFromOrg --> distortion TBD    ; reference view TBD    ; current view correct
+
+  if ( pcPicYuvRefView == NULL )
+  {
+    // Update reference view
+    m_apcRenModels[iModelNum]->setStructSynthViewAsRefView();  
+
+    // pcPicYuvRefView != NULL &&  bAnyRefFromOrg --> invalid combination
+    // pcPicYuvRefView != NULL && !bAnyRefFromOrg --> distortion correct; reference view correct; current view correct
+    // pcPicYuvRefView == NULL &&  bAnyRefFromOrg --> distortion TBD    ; reference view correct; current view TBD
+    // pcPicYuvRefView == NULL && !bAnyRefFromOrg --> distortion TBD    ; reference view correct; current view correct
+
+    if ( bAnyRefFromOrg )
+    {    
+      // Update current view and distortion 
+      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]
+          );
+        }
+      }
+      m_apcRenModels[iModelNum]->renderAll( );
+    }
+    else
+    {
+      // Update to distortion
+      m_apcRenModels[iModelNum]->resetStructError();
+    }
+  }      
+
+  if ( m_bLimOutput )
+  {
+    AOT( m_aaeBaseViewPosInModel[ iEncViewSIdx ][iModelNum] == VIEWPOS_INVALID );
+    Int curViewPosInModel = m_aaeBaseViewPosInModel[ iEncViewSIdx ][iModelNum];    
+    m_apcRenModels[iModelNum]->setLimOutStruct( (curViewPosInModel == VIEWPOS_RIGHT)  ? VIEWPOS_LEFT : VIEWPOS_RIGHT );
+  }  
+#endif
 }
 
@@ -549 +619 @@
 TRenModel::setupPart ( UInt uiHorOff, Int iUsedHeight )
 {
-  AOT( iUsedHeight > m_iHeight );     
+//  AOT( iUsedHeight > m_iHeight );     
   m_uiHorOff    = uiHorOff; 
   m_iUsedHeight = iUsedHeight; 
@@ -589 +659 @@
     }
   }
-
-  return ( iDist + (m_iNumOfCurRenModels >> 1) ) / m_iNumOfCurRenModels;
+  return m_iNumOfCurRenModels > 0 ? ( iDist + (m_iNumOfCurRenModels >> 1) ) / m_iNumOfCurRenModels : 0;
 }