Changeset 1394 in 3DVCSoftware for branches/HTM-16.0-dev1/source/App/TAppRenderer

Timestamp:

4 Mar 2016, 09:42:34 (9 years ago)

Author:

tech

Message:

Clean-up VSO.

Location:

branches/HTM-16.0-dev1/source/App/TAppRenderer

Files:

• TAppRendererCfg.cpp (modified) (2 diffs)
• TAppRendererCfg.h (modified) (2 diffs)
• TAppRendererTop.cpp (modified) (3 diffs)

branches/HTM-16.0-dev1/source/App/TAppRenderer/TAppRendererCfg.cpp

@@ -44 +44 @@
 #include "../../Lib/TAppCommon/program_options_lite.h"
 
-#if NH_3D_VSO
+#if NH_3D_VSO || NH_3D
 
 using namespace std;
@@ -207 +207 @@
   else
   {
-  if ( m_bUseSetupString )
-  {
-    std::vector<Int>  iaTempViews;
-    std::vector<Int>* piaTempViews;
-    m_cCameraData     .convertNumberString( m_pchBaseViewCameraNumbers, iaTempViews, VIEW_NUM_PREC );
-    m_cRenModStrParser.setString( (Int) iaTempViews.size(), m_pchViewConfig );
-    piaTempViews               = m_cRenModStrParser.getSynthViews();
-    m_iNumberOfOutputViews     = (Int) m_cRenModStrParser.getNumOfModels();
-    m_iNumberOfInputViews      = (Int) m_cRenModStrParser.getNumOfBaseViews();
-    m_bContOutputFileNumbering = true;
-
-  m_cCameraData.init( MAX_INPUT_VIEW_NUM, uiInputBitDepth, uiCamParPrecision, (UInt)m_iFrameSkip, (UInt)m_iFramesToBeRendered,
-      m_pchCameraParameterFile, m_pchBaseViewCameraNumbers, NULL, piaTempViews, m_iLog2SamplingFactor+m_iShiftPrecision );
-  }
-  else
-  {
-  m_cCameraData.init( MAX_INPUT_VIEW_NUM, uiInputBitDepth, uiCamParPrecision, (UInt)m_iFrameSkip, (UInt)m_iFramesToBeRendered,
-      m_pchCameraParameterFile, m_pchBaseViewCameraNumbers, m_pchSynthViewCameraNumbers, NULL, m_iLog2SamplingFactor+m_iShiftPrecision );
-  m_iNumberOfOutputViews = (Int) m_cCameraData.getSynthViewNumbers().size();
-  m_iNumberOfInputViews  = (Int) m_cCameraData.getBaseViewNumbers() .size();
-  }
+#if NH_3D_VSO
+    if ( m_bUseSetupString )
+    {
+      std::vector<Int>  iaTempViews;
+      std::vector<Int>* piaTempViews;
+      m_cCameraData     .convertNumberString( m_pchBaseViewCameraNumbers, iaTempViews, VIEW_NUM_PREC );
+      m_cRenModStrParser.setString( (Int) iaTempViews.size(), m_pchViewConfig );
+      piaTempViews               = m_cRenModStrParser.getSynthViews();
+      m_iNumberOfOutputViews     = (Int) m_cRenModStrParser.getNumOfModels();
+      m_iNumberOfInputViews      = (Int) m_cRenModStrParser.getNumOfBaseViews();
+      m_bContOutputFileNumbering = true;
+
+      m_cCameraData.init( MAX_INPUT_VIEW_NUM, uiInputBitDepth, uiCamParPrecision, (UInt)m_iFrameSkip, (UInt)m_iFramesToBeRendered,
+        m_pchCameraParameterFile, m_pchBaseViewCameraNumbers, NULL, piaTempViews, m_iLog2SamplingFactor+m_iShiftPrecision );
+    }
+    else
+    {
+      m_cCameraData.init( MAX_INPUT_VIEW_NUM, uiInputBitDepth, uiCamParPrecision, (UInt)m_iFrameSkip, (UInt)m_iFramesToBeRendered,
+        m_pchCameraParameterFile, m_pchBaseViewCameraNumbers, m_pchSynthViewCameraNumbers, NULL, m_iLog2SamplingFactor+m_iShiftPrecision );
+      m_iNumberOfOutputViews = (Int) m_cCameraData.getSynthViewNumbers().size();
+      m_iNumberOfInputViews  = (Int) m_cCameraData.getBaseViewNumbers() .size();
+    }
+#else
+    AOF( false ); // Compile with VSO enabled to use this option.
+#endif
   }
 

branches/HTM-16.0-dev1/source/App/TAppRenderer/TAppRendererCfg.h

@@ -47 +47 @@
 #include <vector>
 
-#if NH_3D_VSO
+#if NH_3D_VSO  || NH_3D
 
 // ====================================================================================================================
@@ -91 +91 @@
   // derived
   TAppComCamPara      m_cCameraData;                    ///< class to store camera parameters
+#if NH_3D_VSO
   TRenModSetupStrParser m_cRenModStrParser;             ///< class to manage View to be rendered
+#endif
   Bool                m_bUseSetupString;                ///< true if setup string is used
 

branches/HTM-16.0-dev1/source/App/TAppRenderer/TAppRendererTop.cpp

@@ -434 +434 @@
 
       m_apcTVideoIOYuvSynthOutput[m_bSweep ? 0 : iSynthViewIdx]->write( pcPicYuvSynthOut, IPCOLOURSPACE_UNCHANGED, 0, 0, 0, 0, CHROMA_420 );
-    }
+   }
     iFrame++;
     iNumOfRenderedFrames++;
@@ -544 +544 @@
     AOT( m_iLog2SamplingFactor != 0 );
 #if H_3D_VSO_EARLY_SKIP
+    cCurModel.create( m_cRenModStrParser.getNumOfBaseViews(), m_cRenModStrParser.getNumOfModels(), m_iSourceWidth, m_iSourceHeight, m_iShiftPrecision, m_iBlendHoleMargin, false, false );
+#else
     cCurModel.create( m_cRenModStrParser.getNumOfBaseViews(), m_cRenModStrParser.getNumOfModels(), m_iSourceWidth, m_iSourceHeight, m_iShiftPrecision, m_iBlendHoleMargin, false );
-#else
-    cCurModel.create( m_cRenModStrParser.getNumOfBaseViews(), m_cRenModStrParser.getNumOfModels(), m_iSourceWidth, m_iSourceHeight, m_iShiftPrecision, m_iBlendHoleMargin );
 #endif
 
@@ -725 +725 @@
 
 #if H_3D_VSO_EARLY_SKIP
-  cCurModel.create( m_iNumberOfInputViews, m_iNumberOfOutputViews, m_iSourceWidth, m_iSourceHeight, m_iShiftPrecision, m_iBlendHoleMargin, false );
+  cCurModel.create( m_iNumberOfInputViews, m_iNumberOfOutputViews, m_iSourceWidth, m_iSourceHeight, m_iShiftPrecision, m_iBlendHoleMargin, false , false);
 #else
-  cCurModel.create( m_iNumberOfInputViews, m_iNumberOfOutputViews, m_iSourceWidth, m_iSourceHeight, m_iShiftPrecision, m_iBlendHoleMargin );
+  cCurModel.create( m_iNumberOfInputViews, m_iNumberOfOutputViews, m_iSourceWidth, m_iSourceHeight, m_iShiftPrecision, m_iBlendHoleMargin ,false);
 #endif
   cCurModel.setupPart( 0, m_iSourceHeight  );