Changeset 604 in 3DVCSoftware

Timestamp:

31 Aug 2013, 20:04:13 (11 years ago)

Author:

tech

Message:

• Modified fix regarding camera parameter warnings. (H_3D_FIX_REN_WARNING)
• Added shark sequence cfg files

Location:

branches/HTM-DEV-2.0-dev0

Files:

• cfg/3D-HEVC/seqCfg_Shark.cfg (added)
• cfg/MV-HEVC/seqCfg_Shark.cfg (added)
• cfg/Renderer/cam_shark.cfg (added)
• source/App/TAppEncoder/TAppEncTop.cpp (modified) (1 diff)
• source/App/TAppRenderer/TAppRendererTop.cpp (modified) (1 diff)
• source/Lib/TAppCommon/TAppComCamPara.cpp (modified) (12 diffs)
• source/Lib/TAppCommon/TAppComCamPara.h (modified) (4 diffs)
• source/Lib/TLibCommon/TypeDef.h (modified) (3 diffs)

branches/HTM-DEV-2.0-dev0/source/App/TAppEncoder/TAppEncTop.cpp

@@ -772 +772 @@
   printRateSummary();
 
-#if H_3D_FIX_REN_WARNING
+#if H_3D_REN_MAX_DEV_OUT
   Double dMaxDispDiff = m_cCameraData.getMaxShiftDeviation(); 
 

branches/HTM-DEV-2.0-dev0/source/App/TAppRenderer/TAppRendererTop.cpp

@@ -480 +480 @@
   }
 
-#if H_3D_FIX_REN_WARNING
+#if H_3D_REN_MAX_DEV_OUT
   Double dMaxDispDiff = m_cCameraData.getMaxShiftDeviation(); 
 

branches/HTM-DEV-2.0-dev0/source/Lib/TAppCommon/TAppComCamPara.cpp

@@ -611 +611 @@
 }
 
-
 Void
 TAppComCamPara::xGetGeometryData( Int iView, UInt uiFrame, Double& rdFocalLength, Double& rdPosition, Double& rdCameraShift, Bool& rbInterpolated )
 {
   UInt uiFoundLine = -1;
+#if H_3D_FIX_REN_WARNING
+  if ( !xGetCameraDataRow( iView, uiFrame, uiFoundLine ) && xIsIn( m_aiSortedBaseViews, iView ))
+#else  
   if ( !xGetCameraDataRow( iView, uiFrame, uiFoundLine ) )
+#endif
   {
     AOT( m_aadCameraParameters[ uiFoundLine ].size() < 6 );
@@ -632 +635 @@
     Int  iDummy;
 
+#if H_3D_FIX_REN_WARNING
+    if( !xGetLeftRightView( iView, m_aiSortedBaseViews, iLeftView, iRightView, iDummy, iDummy ) ||
+#else
     if( !xGetLeftRightView( iView, m_aiViewsInCfgFile, iLeftView, iRightView, iDummy, iDummy ) ||
+#endif
          xGetCameraDataRow( iLeftView,  uiFrame, uiLeftViewLine  )                             ||
          xGetCameraDataRow( iRightView, uiFrame, uiRightViewLine )
       )
     {
+#if H_3D_FIX_REN_WARNING
+      std::cerr << "No left or no right base view next to view " << (Double)iView / m_dViewNumPrec << " for Frame " << uiFrame << " given in CameraParameterFile" << std::endl;
+#else
       std::cerr << "No Left or no Right View next to View " << (Double)iView / m_dViewNumPrec << " for Frame " << uiFrame << " given in CameraParameterFile" << std::endl;
+#endif
       AOT(true);
       exit( EXIT_FAILURE );
@@ -841 +852 @@
   Int     iLog2DivLuma   = m_uiBitDepthForLUT + m_uiCamParsCodedPrecision + 1 - m_iLog2Precision;   AOF( iLog2DivLuma > 0 );
   Int     iLog2DivChroma = iLog2DivLuma + 1;
-#if !H_3D_FIX_REN_WARNING
+
   Double  dMaxDispDev    = 0.0;
   Double  dMaxRndDispDvL = 0.0;
   Double  dMaxRndDispDvC = 0.0;
-#endif
+
   for( UInt uiSourceView = 0; uiSourceView < uiNumberSourceViews; uiSourceView++ )
   {
@@ -887 +898 @@
         // integer-valued look-up tables
         Int64   iTempScale      = (Int64)uiDepthValue * iScale;
-#if !H_3D_FIX_REN_WARNING        
         Int64   iTestScale      = ( iTempScale + iOffset       );   // for checking accuracy of camera parameters
-#endif
         Int64   iShiftLuma      = ( iTempScale + iOffsetLuma   ) >> iLog2DivLuma;
         Int64   iShiftChroma    = ( iTempScale + iOffsetChroma ) >> iLog2DivChroma;
@@ -896 +905 @@
 
         // maximum deviation
-#if H_3D_FIX_REN_WARNING        
+#if H_3D_REN_MAX_DEV_OUT
         m_dMaxShiftDeviation = std::max( m_dMaxShiftDeviation, fabs( Double( (Int) iShiftLuma   ) - dShiftLuma   ) / Double( 1 << m_iLog2Precision ) );        
-#else
+#endif
         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 ) );
-#endif
       }
 
@@ -912 +920 @@
   }
 
-#if !H_3D_FIX_REN_WARNING
   // check maximum deviation
   Double  dMaxAllowedDispDev    =       Double( 1 << m_iLog2Precision ) / Double( 1 << m_uiCamParsCodedPrecision );       //  counting only the impact of camera parameter rounding
@@ -934 +941 @@
     }
   }
-#endif
 }
 
@@ -1036 +1042 @@
   m_bCamParsCodedPrecSet      = false;
 
-#if H_3D_FIX_REN_WARNING
+#if H_3D_REN_MAX_DEV_OUT
   m_dMaxShiftDeviation        = -1; 
 #endif
@@ -1167 +1173 @@
     if( m_aiViewsInCfgFile.size() < 2 )
     {
-    std::cerr << "Failed reading config file" << std::endl;
+      std::cerr << "Failed reading config file" << std::endl;
       std::cerr << "At least two views must be given" << std::endl;
       exit( EXIT_FAILURE );
@@ -1332 +1338 @@
       else
       {
-      for( UInt uiFrame = m_uiFirstFrameId; uiFrame <= m_uiLastFrameId; uiFrame++ )
-      {
-        Bool bInterpolatedCur;
-        xGetGeometryData( m_aiBaseViews[ uiBaseView ], uiFrame, dDummy, dDummy, dDummy, bInterpolatedCur );
-        xGetZNearZFar   ( m_aiBaseViews[ uiBaseView ], uiFrame, dDummy, dDummy );
-
-        if( bInterpolatedCur )
+        for( UInt uiFrame = m_uiFirstFrameId; uiFrame <= m_uiLastFrameId; uiFrame++ )
         {
-          std::cerr << "Error: CameraParameters for BaseView " << (Double)m_aiBaseViews[ uiBaseView ] / m_dViewNumPrec << " and Frame " << uiFrame << " not defined. "  << std::endl;
-          exit( EXIT_FAILURE );
+          Bool bInterpolatedCur;
+          xGetGeometryData( m_aiBaseViews[ uiBaseView ], uiFrame, dDummy, dDummy, dDummy, bInterpolatedCur );
+          xGetZNearZFar   ( m_aiBaseViews[ uiBaseView ], uiFrame, dDummy, dDummy );
+
+          if( bInterpolatedCur )
+          {
+            std::cerr << "Error: CameraParameters for BaseView " << (Double)m_aiBaseViews[ uiBaseView ] / m_dViewNumPrec << " and Frame " << uiFrame << " not defined. "  << std::endl;
+            exit( EXIT_FAILURE );
+          }
         }
       }
-
-      }
-    }
+    }
+#if H_3D_FIX_REN_WARNING
+    Bool bIgnoreFirst = true;     
+    for( UInt uiERView = 0; uiERView < m_aiSynthViews.size() && !m_bSetupFromCoded; uiERView++ )
+    {
+      if ( xIsIn(m_aiViewsInCfgFile, m_aiSynthViews[ uiERView ] ) )
+      {
+        if ( bIgnoreFirst )
+        {
+          std::cout << "Ignoring CameraParameterFile entries for virtual view(s): " ;
+          //GT: Integer precision virtual view camera parameters are always interpolated from coded views camera parameters.
+          bIgnoreFirst = false; 
+        }
+        std::cout << (Double)m_aiSynthViews[ uiERView ] / m_dViewNumPrec << " " ; 
+      }
+    }
+    if ( !bIgnoreFirst )
+    {
+      std::cout << std::endl; 
+    }
+#endif
 
     Bool bInterpolateFirst = true; 
@@ -1365 +1390 @@
         if ( bInterpolateFirst ) 
         {
+#if H_3D_FIX_REN_WARNING                        
+          std::cout << "Interpolating camera parameters      for virtual view(s): " ; 
+#else
           std::cout << "Interpolating Camera Parameters for View(s) " ; 
+#endif
             bInterpolateFirst = false; 
         }          
@@ -1469 +1498 @@
 }
 
+#if H_3D_FIX_REN_WARNING
+Bool 
+  TAppComCamPara::xIsIn( std::vector<Int>& rVec, Int iElem) 
+{
+  Bool bFound = false; 
+  for (Int idx = 0; idx < rVec.size() && !bFound; idx++)
+  {
+    bFound = bFound || rVec[idx] == iElem; 
+  }
+  return bFound;
+}
+#endif
+
 Int TAppComCamPara::getRelDistLeft( Int iSynthViewIdx, Int iLeftViewIdx, Int iRightViewIdx )
 {

branches/HTM-DEV-2.0-dev0/source/Lib/TAppCommon/TAppComCamPara.h

@@ -67 +67 @@
   Bool                m_bCamParsCodedPrecSet;                 ///< Coded Cam Para precision set for current frame;
   
-#if H_3D_FIX_REN_WARNING
+#if H_3D_REN_MAX_DEV_OUT
   Double              m_dMaxShiftDeviation;                   ///< Maximum deviation of shifts with integer precision compare to double precision
 #endif
@@ -129 +129 @@
   Void  xSetupBaseViewsFromCoded  ();
   Void  xSetupBaseViews           ( Char* pchBaseViewNumbers, UInt uiNumBaseViews );
+#if H_3D_FIX_REN_WARNING
+  Bool  xIsIn                     ( std::vector<Int>& rVec, Int iNumber);
+#endif
+
 
   // functions for getting and setting scales and offsets
@@ -183 +187 @@
   UInt                getCurFrameId             ()  { return m_iCurrentFrameId;   }
   static Void         convertNumberString       ( Char* pchViewNumberString, std::vector<Int>& raiViewNumbers, Double dViewNumPrec );
-#if H_3D_FIX_REN_WARNING
+#if H_3D_REN_MAX_DEV_OUT
   Double              getMaxShiftDeviation      () { return m_dMaxShiftDeviation; }; 
 #endif
@@ -217 +221 @@
   Int**               getCodedOffset            ()  { return m_aaiCodedOffset;          }
 };
-
-
 
 

branches/HTM-DEV-2.0-dev0/source/Lib/TLibCommon/TypeDef.h

@@ -141 +141 @@
 
 /////////////////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////   NEW ADOPTIONS       ///////////////////////////////
+///////////////////////////////////   HTM-8.0 INTEGRATIONS //////////////////////////////
 /////////////////////////////////////////////////////////////////////////////////////////
 
@@ -196 +196 @@
 #endif
 
+#define H_3D_REN_MAX_DEV_OUT              0  // Output maximal possible shift deviation 
+
 /// FIXES
 #define H_3D_FIX_BVSP                     1  // DV from NBDV instead of DoNBDV should be used
@@ -201 +203 @@
 #define H_3D_FIX_REN                      1  // fix of erroneous inpainting for renderer
 #define H_3D_FIX_REN_WARNING              1  // fix of warning related to camera parameter precision
+
 #define H_3D_FIX_UINT_WARNING             1  // explicit in VSD
 #endif // H_3D
+
+
+/////////////////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////   HTM-8.1 INTEGRATIONS //////////////////////////////
+/////////////////////////////////////////////////////////////////////////////////////////
+
+// Please put HTM-8.1 Integration defines here, when possible 
+
+
+
 
 /////////////////////////////////////////////////////////////////////////////////////////