Changeset 194 in 3DVCSoftware for branches/HTM-5.0-Qualcomm/source/App/TAppEncoder/TAppEncCfg.cpp

Timestamp:

26 Nov 2012, 18:35:20 (12 years ago)

Author:

qualcomm

Message:

JCT3V-B0046, MVHEVC codec;
Two bugs fixed for HTM:
1) encoder crash, see the macro 'BUG_FIX_HTM'
2) wrong place for '#endif' in TComPrediction.h

File:

• branches/HTM-5.0-Qualcomm/source/App/TAppEncoder/TAppEncCfg.cpp (modified) (3 diffs)

branches/HTM-5.0-Qualcomm/source/App/TAppEncoder/TAppEncCfg.cpp

@@ -329 +329 @@
   /* Camera Paremetes */
   ("CameraParameterFile,cpf", m_pchCameraParameterFile,    (Char *) 0, "Camera Parameter File Name")
+#if MVHEVC
+  ("BaseViewCameraNumbers" ,  m_aiVId,     std::vector<Int>(1, MAX_VIEW_NUM), "Numbers of base views")
+#endif
   ("BaseViewCameraNumbers" ,  m_pchBaseViewCameraNumbers,  (Char *) 0, "Numbers of base views")
 
@@ -786 +789 @@
 }
 #else
+#if !MVHEVC
   m_cCameraData     .init     ( (UInt)m_iNumberOfViews,
     m_uiInputBitDepth,
@@ -797 +801 @@
     LOG2_DISP_PREC_LUT );
 #endif
+#endif
 
 
   // check validity of input parameters
   xCheckParameter();
+#if !MVHEVC
   m_cCameraData.check( false, true );
-  
+#endif
   // print-out parameters
   xPrintParameter();