Changeset 446 in 3DVCSoftware for branches/HTM-DEV-0.2-dev/source/Lib/TAppCommon

Timestamp:

26 May 2013, 16:22:23 (12 years ago)

Author:

tech

Message:

Added missing parts.

Location:

branches/HTM-DEV-0.2-dev/source/Lib/TAppCommon

Files:

• TAppComCamPara.cpp (modified) (19 diffs)
• TAppComCamPara.h (modified) (4 diffs)
• program_options_lite.h (modified) (3 diffs)

branches/HTM-DEV-0.2-dev/source/Lib/TAppCommon/TAppComCamPara.cpp

@@ -49 +49 @@
 #include <functional>
 #include <string>
-
+#if H_3D
 
 
@@ -58 +58 @@
   AOF( radShiftParams == NULL && raiShiftParams == NULL && radLUT == NULL && raiLUT == NULL );
 
-  uiNumberSourceViews = max( 1, uiNumberSourceViews );
-  uiNumberTargetViews = Max( 1, uiNumberTargetViews );
+  uiNumberSourceViews = std::max( (UInt) 1, uiNumberSourceViews );
+  uiNumberTargetViews = std::max( (UInt) 1, uiNumberTargetViews );
 
   radShiftParams = new Double** [ uiNumberSourceViews ];
@@ -892 +892 @@
 
         // maximum deviation
-        dMaxDispDev     = Max( dMaxDispDev,    fabs( Double( (Int) iTestScale   ) - dShiftLuma * Double( 1 << iLog2DivLuma ) ) / Double( 1 << iLog2DivLuma ) );
-        dMaxRndDispDvL  = Max( dMaxRndDispDvL, fabs( Double( (Int) iShiftLuma   ) - dShiftLuma   ) );
-        dMaxRndDispDvC  = Max( dMaxRndDispDvC, fabs( Double( (Int) iShiftChroma ) - dShiftChroma ) );
+        dMaxDispDev     = std::max( dMaxDispDev,    fabs( Double( (Int) iTestScale   ) - dShiftLuma * Double( 1 << iLog2DivLuma ) ) / Double( 1 << iLog2DivLuma ) );
+        dMaxRndDispDvL  = std::max( dMaxRndDispDvL, fabs( Double( (Int) iShiftLuma   ) - dShiftLuma   ) );
+        dMaxRndDispDvC  = std::max( dMaxRndDispDvC, fabs( Double( (Int) iShiftChroma ) - dShiftChroma ) );
       }
 
@@ -980 +980 @@
   AOF( iMinAbsVOIId != 0 && iMinAbsVOI != 0 );
   xGetCameraShifts( 0, iMinAbsVOIId, m_uiFirstFrameId, dCamPosShift, dPicPosShift );
+#if H_3D_PDM_CAM_PARAS
   Double  dCamPosShiftVOI01     = dCamPosShift / Double( iMinVOI );
+#endif
 
   //--- determine maximum absolute camera position shift, precision, and base scale ---
@@ -993 +995 @@
     }
   }
+
+#if H_3D_PDM_CAM_PARAS
   Int     iPrecision  = 0;
 #if 0 // enabling this lines might be reasonable, but produces different results for the 2 view and 3 view test cases
@@ -1027 +1031 @@
     }
   }
+#endif
 }
 
@@ -1050 +1055 @@
   m_aaiScaleAndOffsetSet      = 0;
 
+#if H_3D_PDM_CAM_PARAS
   m_iPdmPrecision             = 0;
   m_aaiPdmScaleNomDelta       = 0;
   m_aaiPdmOffset              = 0;
+#endif
 
   m_adBaseViewShiftParameter  = 0;
@@ -1078 +1085 @@
   xDeleteArray( m_aiBaseViewShiftLUT,        m_iNumberOfBaseViews, m_iNumberOfBaseViews,  2 );
 
-  xDeleteArray( m_adSynthViewShiftParameter, m_iNumberOfBaseViews, Max(1,m_iNumberOfSynthViews));
-  xDeleteArray( m_aiSynthViewShiftParameter, m_iNumberOfBaseViews, Max(1,m_iNumberOfSynthViews));
-  xDeleteArray( m_adSynthViewShiftLUT,       m_iNumberOfBaseViews, Max(1,m_iNumberOfSynthViews), 2 );
-  xDeleteArray( m_aiSynthViewShiftLUT,       m_iNumberOfBaseViews, Max(1,m_iNumberOfSynthViews), 2 );
+  xDeleteArray( m_adSynthViewShiftParameter, m_iNumberOfBaseViews, std::max((Int) 1 ,m_iNumberOfSynthViews));
+  xDeleteArray( m_aiSynthViewShiftParameter, m_iNumberOfBaseViews, std::max((Int) 1 ,m_iNumberOfSynthViews));
+  xDeleteArray( m_adSynthViewShiftLUT,       m_iNumberOfBaseViews, std::max((Int) 1 ,m_iNumberOfSynthViews), 2 );
+  xDeleteArray( m_aiSynthViewShiftLUT,       m_iNumberOfBaseViews, std::max( (Int)1 ,m_iNumberOfSynthViews), 2 );
 
   xDeleteArray( m_aaiCodedScale,             m_iNumberOfBaseViews );
@@ -1087 +1094 @@
   xDeleteArray( m_aaiScaleAndOffsetSet,      m_iNumberOfBaseViews );
 
+#if H_3D_PDM_CAM_PARAS
   xDeleteArray( m_aaiPdmScaleNomDelta,       m_iNumberOfBaseViews );
   xDeleteArray( m_aaiPdmOffset,              m_iNumberOfBaseViews );
+#endif
 }
 
@@ -1106 +1115 @@
 
     Int iViewOrderIdx  = (Int)( m_aadCameraParameters[ uiRow ][ 1 ] );
-    iMinViewOrderIdx   = Min( iViewOrderIdx, iMinViewOrderIdx );
+    iMinViewOrderIdx   = std::min( iViewOrderIdx, iMinViewOrderIdx );
 
     aiViewOrderIdx     .push_back( iViewOrderIdx );
@@ -1121 +1130 @@
     m_aiBaseId2SortedId.push_back( iCurBaseView );
     m_aiBaseSortedId2Id.push_back( iCurBaseView );
-
   }
 
@@ -1332 +1340 @@
   xInit2dArray  ( (UInt)m_iNumberOfBaseViews, (UInt)m_iNumberOfBaseViews,  m_aaiScaleAndOffsetSet, 0 );
 
+#if H_3D_PDM_CAM_PARAS
   xCreate2dArray( (UInt)m_iNumberOfBaseViews, (UInt)m_iNumberOfBaseViews,  m_aaiPdmScaleNomDelta     );
   xCreate2dArray( (UInt)m_iNumberOfBaseViews, (UInt)m_iNumberOfBaseViews,  m_aaiPdmOffset            );
@@ -1337 +1346 @@
   //===== init disparity to virtual depth conversion parameters =====
   xSetPdmConversionParams();
+#endif
 
   //===== init arrays for first frame =====
@@ -1385 +1395 @@
     }
 
+    Bool bInterpolateFirst = true; 
+    Bool bAnyInterpolated  = false; 
     for( UInt uiERView = 0; uiERView < m_aiSynthViews.size() && !m_bSetupFromCoded; uiERView++ )
     {
@@ -1394 +1406 @@
         bInterpolated |= bInterpolatedCur;
       }
+      
       if( bInterpolated )
       {
-        std::cout << "Interpolating Camera Parameters for View " << (Double)m_aiSynthViews[ uiERView ] / m_dViewNumPrec << std::endl;
-      }
-    }
+        bAnyInterpolated = true; 
+        if ( bInterpolateFirst ) 
+        {
+          std::cout << "Interpolating Camera Parameters for View(s) " ; 
+            bInterpolateFirst = false; 
+        }          
+        std::cout << (Double)m_aiSynthViews[ uiERView ] / m_dViewNumPrec << " " ; 
+      }
+    }
+    if ( bAnyInterpolated )
+      std::cout << std::endl;
   }
 
@@ -1433 +1454 @@
 }
 
-#if SAIT_VSO_EST_A0033
-Void
-TAppComCamPara::xSetDispCoeff( UInt uiFrameId, Int iViewIdx )
+#if H_3D_VSO
+Void
+TAppComCamPara::setDispCoeff( UInt uiFrameId, Int iViewIdx )
 {
   UInt uiFrame = m_uiFirstFrameId + uiFrameId;
@@ -1453 +1474 @@
     xGetZNearZFar   ( iSourceViewNum, uiFrame, dZN1, dZF1 );
 
-    dBaseLine = ( Max( dPos[0], Max( dPos[1], dPos[2] ) ) - Min( dPos[0], Min( dPos[1], dPos[2] ) ) ) / 2.0;
+    dBaseLine = ( std::max( dPos[0], std::max( dPos[1], dPos[2] ) ) - std::min( dPos[0], std::min( dPos[1], dPos[2] ) ) ) / 2.0;
   }
   else if( m_iNumberOfBaseViews == 2 )
@@ -1465 +1486 @@
     dBaseLine = dPos[0] - dPos[1];
   }
-
 
   m_dDispCoeff = fabs( dFL1 * ( dBaseLine / 2.0 ) / 255.0 * ( 1.0/dZN1 - 1.0/dZF1 ) );
@@ -1510 +1530 @@
   return xGetViewId(m_aiRelSynthViewsNum, iRelNum );
 }
+#endif

branches/HTM-DEV-0.2-dev/source/Lib/TAppCommon/TAppComCamPara.h

@@ -66 +66 @@
   Bool                m_bSetupFromCoded;                      ///< setup from coded parameter file
   Bool                m_bCamParsCodedPrecSet;                 ///< Coded Cam Para precision set for current frame;
-
-#if SAIT_VSO_EST_A0033
+  
+  //SAIT_VSO_EST_A0033
   Double              m_dDispCoeff;
-#endif
 
   // view lists
@@ -90 +89 @@
   Int**               m_aaiScaleAndOffsetSet;                 ///< array indicating whether scale and offset have been set
 
+#if H_3D_PDM_CAM_PARAS
   // parameters for virtual depth map generation
   Int                 m_iPdmPrecision;                        ///< additional precision for disparity - virtual depth conversion
   Int**               m_aaiPdmScaleNomDelta;                  ///< [TargetView][RefView] delta for nominator of scale factor
   Int**               m_aaiPdmOffset;                         ///< [TargetView][RefView] offset parameter
+#endif
 
   // scale and offset parameters
@@ -182 +183 @@
 
   Int                 synthRelNum2Idx           ( Int iRelNum );
-  Bool getLeftRightBaseView( Int iSynthViewIdx, Int &riLeftViewIdx, Int &riRightViewIdx, Int &riRelDistToLeft, Bool& rbIsBaseView );
+  Bool                getLeftRightBaseView      ( Int iSynthViewIdx, Int &riLeftViewIdx, Int &riRightViewIdx, Int &riRelDistToLeft, Bool& rbIsBaseView );
   Int                 getRelDistLeft            ( Int iSynthViewIdx, Int   iLeftViewIdx, Int iRightViewIdx );
   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; }
+#if H_3D_VSO
+  // SAIT_VSO_EST_A033
+  Void                setDispCoeff              ( UInt uiStartFrameId, Int iViewIdx );
+  Double              getDispCoeff              () { return m_dDispCoeff; }
 #endif
 
@@ -216 +218 @@
   Int**               getCodedOffset            ()  { return m_aaiCodedOffset;          }
 
+#if H_3D_PDM_CAM_PARAS
   // parameters for virtual depth map generation
   Int                 getPdmPrecision           ()  { return m_iPdmPrecision;           }
   Int**               getPdmScaleNomDelta       ()  { return m_aaiPdmScaleNomDelta;     }
   Int**               getPdmOffset              ()  { return m_aaiPdmOffset;            }
+#endif
 };
 

branches/HTM-DEV-0.2-dev/source/Lib/TAppCommon/program_options_lite.h

@@ -46 +46 @@
 #endif
 #endif
-
 //! \ingroup TAppCommon
 //! \{
@@ -283 +282 @@
     }
 #endif
-
     /** Option class for argument handling using a user provided function */
     struct OptionFunc : public OptionBase
@@ -382 +380 @@
       }
 #endif
-
       /**
        * Add option described by name to the parent Options list,