Changeset 1196 in 3DVCSoftware for trunk/source/Lib/TAppCommon

Timestamp:

4 May 2015, 17:47:40 (10 years ago)

Author:

tech

Message:

Merged 14.0-dev0@1187.

Location:

trunk/source/Lib/TAppCommon

Files:

• TAppComCamPara.cpp (modified) (3 diffs)
• TAppComCamPara.h (modified) (3 diffs)

trunk/source/Lib/TAppCommon/TAppComCamPara.cpp

@@ -399 +399 @@
 
 
-#if !HHI_CAM_PARA_K0052
-Void
-TAppComCamPara::xGetViewOrderIndices( const std::vector<Int>& raiId2SortedId, std::vector<Int>& raiVOIdx )
-{
-  AOF( raiId2SortedId.size() );
-  raiVOIdx  =      raiId2SortedId;
-  Int iSize = (Int)raiId2SortedId.size();
-  Int iOffs =      raiId2SortedId[ 0 ];
-  for( Int iIdx = 0; iIdx < iSize; iIdx++ )
-  {
-    raiVOIdx[ iIdx ] -= iOffs;
-  }
-}
-#endif
 
 
@@ -960 +946 @@
 
 
-#if !HHI_CAM_PARA_K0052
-Void
-TAppComCamPara::xSetPdmConversionParams()
-{
-  AOF( m_aiViewOrderIndex[ 0 ] == 0 );
-  if ( m_bSetupFromCoded || m_iNumberOfBaseViews    <  2 )
-  {
-    return;
-  }
-
-  //--- determine (virtual) camera parameter shift between view order index 1 and base view (view order index 0) ---
-  Double        dCamPosShift, dPicPosShift;
-  Int           iMinAbsVOI    = (1<<30);
-  Int           iMinAbsVOIId  = 0;
-  for( Int iBaseId = 1; iBaseId < m_iNumberOfBaseViews; iBaseId++ )
-  {
-    Int iAbsVOI = ( m_aiViewOrderIndex[ iBaseId ] < 0 ? -m_aiViewOrderIndex[ iBaseId ] : m_aiViewOrderIndex[ iBaseId ] );
-    if( iAbsVOI < iMinAbsVOI )
-    {
-      iMinAbsVOI   = iAbsVOI;
-      iMinAbsVOIId = iBaseId;
-    }
-  }
-  AOF( iMinAbsVOIId != 0 && iMinAbsVOI != 0 );
-  xGetCameraShifts( 0, iMinAbsVOIId, m_uiFirstFrameId, dCamPosShift, dPicPosShift );
-
-  //--- determine maximum absolute camera position shift, precision, and base scale ---
-  Double  dMaxAbsCamPosShift = 0.0;
-  for( Int iTargetId = 1; iTargetId < m_iNumberOfBaseViews; iTargetId++ )
-  {
-    for( Int iBaseId = 0; iBaseId < iTargetId; iBaseId++ )
-    {
-      xGetCameraShifts( (UInt)iBaseId, (UInt)iTargetId, m_uiFirstFrameId, dCamPosShift, dPicPosShift );
-      dCamPosShift        = ( dCamPosShift < 0.0                ? -dCamPosShift : dCamPosShift       );
-      dMaxAbsCamPosShift  = ( dCamPosShift > dMaxAbsCamPosShift ?  dCamPosShift : dMaxAbsCamPosShift );
-    }
-  }
-}
-#endif
 
 
@@ -1284 +1231 @@
 
   //===== set derived parameters =====
-#if !HHI_CAM_PARA_K0052
-  xGetViewOrderIndices( m_aiBaseId2SortedId, m_aiViewOrderIndex );
-#endif
   m_bCamParsVaryOverTime = xGetCamParsChangeFlag();
 

trunk/source/Lib/TAppCommon/TAppComCamPara.h

@@ -85 +85 @@
 
   // SPS and slice header related variables
-#if !HHI_CAM_PARA_K0052
-  std::vector<Int>    m_aiViewOrderIndex;                     ///< list of view order indices
-#endif
   UInt                m_uiCamParsCodedPrecision;              ///< precision for coding of camera parameters (x: max error in disparity is 2^(-x) luma samples)
   Bool                m_bCamParsVaryOverTime;                 ///< flag specifying whether camera parameters vary for given frame numbers
@@ -147 +144 @@
   // getting conversion parameters for disparity to virtual depth conversion
   Void  xGetCameraShifts          ( UInt uiSourceView, UInt uiTargetView, UInt uiFrame, Double& rdCamPosShift, Double& rdPicPosShift );
-#if !HHI_CAM_PARA_K0052
-  Void  xSetPdmConversionParams   ();
-#endif
 
 public:
@@ -220 +214 @@
   Bool                getVaryingCameraParameters()  { return m_bCamParsVaryOverTime;    }
   UInt                getCamParsCodedPrecision  ()  { return m_uiCamParsCodedPrecision; }
-#if !HHI_CAM_PARA_K0052
-  std::vector<Int>&   getViewOrderIndex         ()  { return m_aiViewOrderIndex;        }
-#endif
   Int**               getCodedScale             ()  { return m_aaiCodedScale;           }
   Int**               getCodedOffset            ()  { return m_aaiCodedOffset;          }