Changeset 102 in 3DVCSoftware for trunk/source/App

Timestamp:

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

Author:

tech

Message:

SAIT_VSO_EST_A0033 code improvement

Location:

trunk/source/App/TAppEncoder

Files:

• TAppEncCfg.h (modified) (1 diff)
• TAppEncTop.cpp (modified) (2 diffs)
• TAppEncTop.h (modified) (1 diff)

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