Changeset 956 in 3DVCSoftware for branches/HTM-11.0-dev0-Qualcomm/source/App/TAppEncoder

Timestamp:

1 May 2014, 02:56:23 (11 years ago)

Author:

qualcomm

Message:

Fix for ticket #65 (Changes are guarded by Macro BUG_FIX_TK65)

File:

• branches/HTM-11.0-dev0-Qualcomm/source/App/TAppEncoder/TAppEncCfg.cpp (modified) (1 diff)

branches/HTM-11.0-dev0-Qualcomm/source/App/TAppEncoder/TAppEncCfg.cpp

@@ -1591 +1591 @@
   xConfirmPara( m_pchCameraParameterFile    == 0                ,   "CameraParameterFile must be given");
   xConfirmPara( m_pchBaseViewCameraNumbers  == 0                ,   "BaseViewCameraNumbers must be given" );
+#if BUG_FIX_TK65
+  xConfirmPara( ( ((UInt) m_numberOfLayers >> 1 ) != m_cCameraData.getBaseViewNumbers().size() ) && ( m_numberOfLayers != m_cCameraData.getBaseViewNumbers().size() ),   "Number of Views in BaseViewCameraNumbers must be equal to NumberOfViews" );
+#else
   xConfirmPara( ((UInt) m_numberOfLayers >> 1 ) != m_cCameraData.getBaseViewNumbers().size(),   "Number of Views in BaseViewCameraNumbers must be equal to NumberOfViews" );
+#endif
   xConfirmPara    ( m_iCodedCamParPrecision < 0 || m_iCodedCamParPrecision > 5,       "CodedCamParsPrecision must be in range of 0..5" );
 #if H_3D_VSO