Changeset 102 in 3DVCSoftware for trunk/source/Lib/TLibEncoder

Timestamp:

11 Aug 2012, 14:39:19 (12 years ago)

Author:

tech

Message:

SAIT_VSO_EST_A0033 code improvement

Location:

trunk/source/Lib/TLibEncoder

Files:

• TEncGOP.cpp (modified) (1 diff)
• TEncSlice.cpp (modified) (5 diffs)

trunk/source/Lib/TLibEncoder/TEncGOP.cpp

@@ -461 +461 @@
 
 #if SAIT_VSO_EST_A0033
-    m_pcRdCost->setVideoRecPicYuv( m_pcEncTop->getEncTop()->xGetPicYuvFromViewTemp( pcSlice->getViewId(), pcSlice->getPOC(), false, true ) );
-    m_pcRdCost->setDepthPicYuv   ( m_pcEncTop->getEncTop()->xGetPicYuvFromViewTemp( pcSlice->getViewId(), pcSlice->getPOC(), true, false ) );
+    m_pcRdCost->setVideoRecPicYuv( m_pcEncTop->getEncTop()->getPicYuvFromView( pcSlice->getViewId(), pcSlice->getPOC(), false, true ) );
+    m_pcRdCost->setDepthPicYuv   ( m_pcEncTop->getEncTop()->getPicYuvFromView( pcSlice->getViewId(), pcSlice->getPOC(), true, false ) );
 #endif
 

trunk/source/Lib/TLibEncoder/TEncSlice.cpp

@@ -42 +42 @@
 #endif
 #include <math.h>
-#if SAIT_VSO_EST_A0033
-extern Double g_dDispCoeff;
-#endif
 
 //! \ingroup TLibEncoder
@@ -376 +373 @@
 #endif
 
+#if SAIT_VSO_EST_A0033
+  m_pcRdCost->setDisparityCoeff( m_pcCfg->getDispCoeff() );
+#endif
+
 #if RDOQ_CHROMA_LAMBDA 
 // for RDOQ
@@ -727 +728 @@
  if( m_pcCfg->getUseVSO() )
  {
-   m_pcRdCost->setDisparityCoeff( g_dDispCoeff );  // Temp. code!!!
-   //printf( "Disp Coeff : %3.4f \n", m_pcRdCost->getDisparityCoeff() );
 
    Int frameWidth = m_pcCfg->getSourceWidth();
@@ -739 +738 @@
    for( Int y = 0 ; y < m_pcCfg->getSourceHeight() ; y++ )
    {
-     pVideoRec[-4] = pVideoRec[-3] = pVideoRec[-2] = pVideoRec[-1] = pVideoRec[0];
-     pVideoRec[frameWidth+3] = pVideoRec[frameWidth+2] = pVideoRec[frameWidth+1] = pVideoRec[frameWidth] = pVideoRec[frameWidth-1];
-     pDepthOrg[-4] = pDepthOrg[-3] = pDepthOrg[-2] = pDepthOrg[-1] = pDepthOrg[0];
-     pDepthOrg[frameWidth+3] = pDepthOrg[frameWidth+2] = pDepthOrg[frameWidth+1] = pDepthOrg[frameWidth] = pDepthOrg[frameWidth-1];
+     pVideoRec[-1] = pVideoRec[0];
+     pVideoRec[frameWidth] = pVideoRec[frameWidth-1];
+     pDepthOrg[-1] = pDepthOrg[0];
+     pDepthOrg[frameWidth] = pDepthOrg[frameWidth-1];
 
      pVideoRec += iVideoRecStride;
@@ -749 +748 @@
  }
 #endif
+
   TEncTop* pcEncTop = (TEncTop*) m_pcCfg;
   TEncSbac**** ppppcRDSbacCoders    = pcEncTop->getRDSbacCoders();