Changeset 189 in 3DVCSoftware for trunk/source/App/TAppRenderer

Timestamp:

18 Nov 2012, 22:11:37 (12 years ago)

Author:

tech

Message:

Reintegrated branch 4.1-dev0 Rev. 188.

Location:

trunk/source/App/TAppRenderer

Files:

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

trunk/source/App/TAppRenderer/TAppRendererCfg.cpp

@@ -120 +120 @@
 
     /* File I/O */
-    ("VideoInputFileBaseName",  m_pchVideoInputFileBaseName,  (Char*) 0, "Basename to generate video input file names")
-    ("DepthInputFileBaseName",  m_pchDepthInputFileBaseName,  (Char*) 0, "Basename to generate depth input file names")
-    ("SynthOutputFileBaseName", m_pchSynthOutputFileBaseName, (Char*) 0, "Basename to generate synthesized output file names")
+    ("VideoInputFileBaseName,v",  m_pchVideoInputFileBaseName,  (Char*) 0, "Basename to generate video input file names")
+    ("DepthInputFileBaseName,d",  m_pchDepthInputFileBaseName,  (Char*) 0, "Basename to generate depth input file names")
+    ("SynthOutputFileBaseName,s", m_pchSynthOutputFileBaseName, (Char*) 0, "Basename to generate synthesized output file names")
     ("ContOutputFileNumbering", m_bContOutputFileNumbering  ,  false   , "Continuous Output File Numbering")
     ("Sweep"                  , m_bSweep                    ,  false   , "Store all views in first Output File")
@@ -137 +137 @@
 
     /* Camera Specification */
-    ("CameraParameterFile,cpf", m_pchCameraParameterFile,          (Char *) 0, "Camera Parameter File Name")
+    ("CameraParameterFile,-cpf", m_pchCameraParameterFile,          (Char *) 0, "Camera Parameter File Name")
     ("BaseViewCameraNumbers"  , m_pchBaseViewCameraNumbers,        (Char *) 0, "Numbers of base views")
     ("SynthViewCameraNumbers" , m_pchSynthViewCameraNumbers,       (Char *) 0, "Numbers of views to synthesis")

trunk/source/App/TAppRenderer/TAppRendererTop.cpp

@@ -532 +532 @@
 #endif
 
-#if HHI_VSO_SPEEDUP_A0033
-#if FIX_VSO_SETUP
     cCurModel.setupPart( 0, m_iSourceHeight  ); 
-#else
-    cCurModel.setHorOffset( 0 );
-#endif
-#endif
 
     for ( Int iViewIdx = 0; iViewIdx < m_iNumberOfInputViews; iViewIdx++ )
@@ -713 +707 @@
 
   AOT( m_iLog2SamplingFactor != 0 );
-#if HHI_VSO_SPEEDUP_A0033
-#if FIX_VSO_SETUP
   cCurModel.setupPart( 0, m_iSourceHeight  ); 
-#else
-  cCurModel.setHorOffset( 0 );
-#endif
-#endif
 #if LGE_VSO_EARLY_SKIP_A0093
   cCurModel.create( m_iNumberOfInputViews, m_iNumberOfOutputViews, m_iSourceWidth, m_iSourceHeight, m_iShiftPrecision, m_iBlendHoleMargin, false );