Changeset 13 in 3DVCSoftware

Timestamp:

7 Feb 2012, 02:04:12 (13 years ago)

Author:

poznan-univ

Message:

SVN merge bug Fix

Location:

branches/0.2-poznan-univ/source

Files:

• App/TAppCommon/TAppComCamPara.cpp (modified) (1 diff)
• App/TAppEncoder/TAppEncTop.cpp (modified) (1 diff)
• Lib/TLibCommon/TypeDef.h (modified) (1 diff)

branches/0.2-poznan-univ/source/App/TAppCommon/TAppComCamPara.cpp

@@ -1365 +1365 @@
 }
 
-  xReadCameraParameterFile( pchCfgFileName );
-
-  m_bSetupFromCoded         = ( m_aadCameraParameters[ 0 ].size() == 2 );
-
-  if ( m_bSetupFromCoded )
-  {
-    std::cout << "Detected decoded camera parameter file. Overwriting base view settings from cfg file. " << std::endl;
-    xSetupBaseViewsFromCoded();
-  }
-  else
-  {
-    xSetupBaseViews( pchBaseViewNumbers, uiNumBaseViews );
-  }
-
-  //===== set derived parameters =====
-  xGetViewOrderIndices( m_aiBaseId2SortedId, m_aiViewOrderIndex );
-  m_bCamParsVaryOverTime = xGetCamParsChangeFlag();
-
-
-  //===== create arrays =====
-  xCreateLUTs   ( (UInt)m_iNumberOfBaseViews, (UInt)m_iNumberOfBaseViews,  m_adBaseViewShiftLUT,  m_aiBaseViewShiftLUT,  m_adBaseViewShiftParameter,  m_aiBaseViewShiftParameter  );
-  xCreateLUTs   ( (UInt)m_iNumberOfBaseViews, (UInt)m_iNumberOfSynthViews, m_adSynthViewShiftLUT, m_aiSynthViewShiftLUT, m_adSynthViewShiftParameter, m_aiSynthViewShiftParameter );
-  xCreate2dArray( (UInt)m_iNumberOfBaseViews, (UInt)m_iNumberOfBaseViews,  m_aaiCodedScale           );
-  xCreate2dArray( (UInt)m_iNumberOfBaseViews, (UInt)m_iNumberOfBaseViews,  m_aaiCodedOffset          );
-  xCreate2dArray( (UInt)m_iNumberOfBaseViews, (UInt)m_iNumberOfBaseViews,  m_aaiScaleAndOffsetSet    );
-  xInit2dArray  ( (UInt)m_iNumberOfBaseViews, (UInt)m_iNumberOfBaseViews,  m_aaiScaleAndOffsetSet, 0 );
-
-  xCreate2dArray( (UInt)m_iNumberOfBaseViews, (UInt)m_iNumberOfBaseViews,  m_aaiPdmScaleNomDelta     );
-  xCreate2dArray( (UInt)m_iNumberOfBaseViews, (UInt)m_iNumberOfBaseViews,  m_aaiPdmOffset            );
-
-  //===== init disparity to virtual depth conversion parameters =====
-  xSetPdmConversionParams();
-
-  //===== init arrays for first frame =====
-  xSetShiftParametersAndLUT( m_uiFirstFrameId );
-}
-#endif//*/
-
 Void
 TAppComCamPara::check( Bool bCheckViewRange, Bool bCheckFrameRange )

branches/0.2-poznan-univ/source/App/TAppEncoder/TAppEncTop.cpp

@@ -1278 +1278 @@
   {
     iCurPoc = m_acTEncTopList[ iCoddedViewIdx ]->getNextFrameId();
-  if (!(m_acTEncTopList[ iCoddedViewIdx ]->currentPocWillBeCoded())) return;
-
+    if (!(m_acTEncTopList[ iCoddedViewIdx ]->currentPocWillBeCoded())) return;
+  }
   Int iNumberOfReferenceViews = 0;
   UInt iSynthViewIdx;

branches/0.2-poznan-univ/source/Lib/TLibCommon/TypeDef.h

@@ -92 +92 @@
 #endif
 
-#endif
-
 // ---------------------------------------