Changeset 102 in 3DVCSoftware for trunk/source

Timestamp:

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

Author:

tech

Message:

SAIT_VSO_EST_A0033 code improvement

Location:

trunk/source

Files:

• App/TAppEncoder/TAppEncCfg.h (modified) (1 diff)
• App/TAppEncoder/TAppEncTop.cpp (modified) (2 diffs)
• App/TAppEncoder/TAppEncTop.h (modified) (1 diff)
• Lib/TAppCommon/TAppComCamPara.cpp (modified) (1 diff)
• Lib/TAppCommon/TAppComCamPara.h (modified) (2 diffs)
• Lib/TLibEncoder/TEncGOP.cpp (modified) (1 diff)
• Lib/TLibEncoder/TEncSlice.cpp (modified) (5 diffs)

trunk/source/App/TAppEncoder/TAppEncCfg.h

@@ -295 +295 @@
 #endif
 #if SAIT_VSO_EST_A0033
-  Bool      m_bUseEstimatedVSD;                           ///< Flag for using model based VSD estimation instead of VSO for some encoder decisions (JCT3V-A0033 modification 3)
-  Double    m_dDispCoeff;
+  Bool      m_bUseEstimatedVSD;                           ///< Flag for using model based VSD estimation instead of VSO for some encoder decisions (JCT3V-A0033 modification 3)  
 #endif
 

trunk/source/App/TAppEncoder/TAppEncTop.cpp

@@ -922 +922 @@
       for(Int iViewIdx=0; iViewIdx < m_iNumberOfViews; iViewIdx++ )
       {
+#if SAIT_VSO_EST_A0033
+        if( m_bUseVSO && iNextPoc < m_iFrameToBeEncoded )
+        {
+          m_cCameraData.xSetDispCoeff( iNextPoc, iViewIdx );
+          m_acTEncDepthTopList[iViewIdx]->setDispCoeff( m_cCameraData.getDispCoeff() );
+        }
+#endif
         iNumEncoded = 0;
         // call encoding function for one frame
@@ -1156 +1163 @@
 };
 
-#if SAIT_VSO_EST_A0033
-TComPicYuv* TAppEncTop::xGetPicYuvFromViewTemp( Int iViewIdx, Int iPoc, Bool bDepth, Bool bRecon )
-{
-  TComPic*    pcPic = xGetPicFromView( iViewIdx, iPoc, bDepth);
-  TComPicYuv* pcPicYuv = NULL;
-
-  if (pcPic != NULL)
-  {
-    if( bRecon )
-    {
-      if ( pcPic->getReconMark() )
-      {
-        pcPicYuv = pcPic->getPicYuvRec();
-      }
-    }
-    else
-    {
-      pcPicYuv = pcPic->getPicYuvOrg();
-    }
-  };
-
-  return pcPicYuv;
-};
-#endif
-
 /**
  *

trunk/source/App/TAppEncoder/TAppEncTop.h

@@ -123 +123 @@
   TAppEncTop();
   virtual ~TAppEncTop();
-  
-#if SAIT_VSO_EST_A0033
-  TComPicYuv* xGetPicYuvFromViewTemp( Int iViewIdx, Int iPoc, Bool bDepth, Bool bRecon );
-#endif
+
 
   Void        encode      ();                               ///< main encoding function

trunk/source/Lib/TAppCommon/TAppComCamPara.cpp

@@ -1456 +1456 @@
 }
 
+#if SAIT_VSO_EST_A0033
+Void
+TAppComCamPara::xSetDispCoeff( UInt uiFrameId, Int iViewIdx )
+{
+  UInt uiFrame = m_uiFirstFrameId + uiFrameId;
+  Int  iSourceViewNum = m_aiBaseViews[ iViewIdx ];
+  Double dBaseLine = 0.0;
+  Double dFL1, dCS1, dCP1, dZN1, dZF1; 
+  Bool bInterpolated;
+  double dPos[3];
+
+  if( m_iNumberOfBaseViews == 3 )
+  {
+    xGetGeometryData( m_aiBaseViews[0], uiFrame, dFL1, dPos[0], dCS1, bInterpolated );
+    xGetGeometryData( m_aiBaseViews[1], uiFrame, dFL1, dPos[1], dCS1, bInterpolated );
+    xGetGeometryData( m_aiBaseViews[2], uiFrame, dFL1, dPos[2], dCS1, bInterpolated );
+
+    xGetGeometryData( iSourceViewNum, uiFrame, dFL1, dCP1, dCS1, bInterpolated );
+    xGetZNearZFar   ( iSourceViewNum, uiFrame, dZN1, dZF1 );
+
+    dBaseLine = ( Max( dPos[0], Max( dPos[1], dPos[2] ) ) - Min( dPos[0], Min( dPos[1], dPos[2] ) ) ) / 2.0;
+  }
+  else if( m_iNumberOfBaseViews == 2 )
+  {
+    xGetGeometryData( m_aiBaseViews[0], uiFrame, dFL1, dPos[0], dCS1, bInterpolated );
+    xGetGeometryData( m_aiBaseViews[1], uiFrame, dFL1, dPos[1], dCS1, bInterpolated );
+
+    xGetGeometryData( iSourceViewNum, uiFrame, dFL1, dCP1, dCS1, bInterpolated );
+    xGetZNearZFar   ( iSourceViewNum, uiFrame, dZN1, dZF1 );
+
+    dBaseLine = dPos[0] - dPos[1];
+  }
+
+
+  m_dDispCoeff = fabs( dFL1 * ( dBaseLine / 2.0 ) / 255.0 * ( 1.0/dZN1 - 1.0/dZF1 ) );
+}
+#endif
 
 Bool

trunk/source/Lib/TAppCommon/TAppComCamPara.h

@@ -67 +67 @@
   Bool                m_bCamParsCodedPrecSet;                 ///< Coded Cam Para precision set for current frame;
 
+#if SAIT_VSO_EST_A0033
+  Double              m_dDispCoeff;
+#endif
+
   // view lists
   std::vector<Int>    m_aiViewsInCfgFile;                     ///< views for which parameters are specified in cfg file (from left to right)
@@ -184 +188 @@
   UInt                getCurFrameId             ()  { return m_iCurrentFrameId;   }
   static Void         convertNumberString       ( Char* pchViewNumberString, std::vector<Int>& raiViewNumbers, Double dViewNumPrec );
+
+#if SAIT_VSO_EST_A0033
+  Void xSetDispCoeff( UInt uiStartFrameId, Int iViewIdx );
+  Double getDispCoeff() { return m_dDispCoeff; }
+#endif
 
   // function for getting parameters and parameter arrays

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();