Merge branch 'develop' into feature/android

* develop:
  refactor(camodocal): remove ceres depend
  feat(synthetic): add DisparityComputingMethod
  refactor(synthetic): GetStreamData
  refactor(synthetic): callback complete
  refactor(synthetic): complete enable_tag and support tag
  refactor(synthetic): add SyntheticProcessorPart class
  refactor(synthetic): use shared_ptr for parent_
  chore(readme): change docs links
  chore(readme): update readme
  chore(readme): update doc links
  fix(bm): format fix
This commit is contained in:
John Zhao
2019-01-25 15:11:11 +08:00
519 changed files with 580 additions and 304943 deletions

View File

@@ -224,6 +224,13 @@ class MYNTEYE_API API {
* Get the option value.
*/
std::int32_t GetOptionValue(const Option &option) const;
/**
* Set the disparity computing method.
*/
void SetDisparityComputingMethodType(
const DisparityComputingMethod &MethodType);
/**
* Set the option value.
*/

View File

@@ -76,15 +76,6 @@ struct glog_init {
#include "mynteye/mynteye.h"
#ifdef WITH_CAM_MODELS
#define MAX_LOG_LEVEL google::INFO
// include ceres miniglog
#include "glog/logging.h"
#else
#define MYNTEYE_MAX_LOG_LEVEL google::INFO
// #define MYNTEYE_MAX_LOG_LEVEL 2
@@ -92,6 +83,4 @@ struct glog_init {
#endif
#endif
#endif // MYNTEYE_LOGGER_H_

View File

@@ -542,6 +542,20 @@ struct MYNTEYE_API Extrinsics {
MYNTEYE_API
std::ostream &operator<<(std::ostream &os, const Extrinsics &ex);
/**
* @ingroup disparity
* Camera disparity computing method type.
*/
enum class DisparityComputingMethod : std::uint8_t {
/** bm */
SGBM = 0,
/** sgbm */
BM = 1,
/** unknow */
UNKNOW
};
/**
* @defgroup datatypes Datatypes
* @brief Public data types.