tami/MYNT-EYE-S-SDK
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(calib process): change the processors enable order

Browse Source
This commit is contained in:
TinyOh 2019-01-09 18:09:01 +08:00
parent dc10d73c96
commit b89b9a20e4
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/mynteye/api/processor/points_processor.cc
View File

@ -75,6 +75,7 @@ Object *PointsProcessor::OnCreateOutput() {
bool PointsProcessor::OnProcess( bool PointsProcessor::OnProcess(
Object *const in, Object *const out, Processor *const parent) { Object *const in, Object *const out, Processor *const parent) {
MYNTEYE_UNUSED(parent) MYNTEYE_UNUSED(parent)
std::cout << calib_infos_->left.height << std::endl;
float fx = 3.6797709792391299e+02; float fx = 3.6797709792391299e+02;
float fy = 3.6808712539453859e+02; float fy = 3.6808712539453859e+02;

6
src/mynteye/api/synthetic.cc
View File

@ -438,11 +438,12 @@ void Synthetic::EnableStreamData(const Stream &stream, std::uint32_t depth) {
} return; } return;
case Stream::POINTS: { case Stream::POINTS: {
stream_enabled_mode_[stream] = MODE_SYNTHETIC; stream_enabled_mode_[stream] = MODE_SYNTHETIC;
EnableStreamData(Stream::DISPARITY, depth + 1);
if (calib_model_ == CalibrationModel::PINHOLE) { if (calib_model_ == CalibrationModel::PINHOLE) {
EnableStreamData(Stream::DISPARITY, depth + 1);
CHECK(ActivateProcessor<PointsProcessorOCV>()); CHECK(ActivateProcessor<PointsProcessorOCV>());
#ifdef WITH_CAM_MODELS #ifdef WITH_CAM_MODELS
} else if (calib_model_ == CalibrationModel::KANNALA_BRANDT) { } else if (calib_model_ == CalibrationModel::KANNALA_BRANDT) {
EnableStreamData(Stream::DEPTH, depth + 1);
CHECK(ActivateProcessor<PointsProcessor>()); CHECK(ActivateProcessor<PointsProcessor>());
#endif #endif
} else { } else {
@ -452,11 +453,12 @@ void Synthetic::EnableStreamData(const Stream &stream, std::uint32_t depth) {
} return; } return;
case Stream::DEPTH: { case Stream::DEPTH: {
stream_enabled_mode_[stream] = MODE_SYNTHETIC; stream_enabled_mode_[stream] = MODE_SYNTHETIC;
EnableStreamData(Stream::POINTS, depth + 1);
if (calib_model_ == CalibrationModel::PINHOLE) { if (calib_model_ == CalibrationModel::PINHOLE) {
EnableStreamData(Stream::POINTS, depth + 1);
CHECK(ActivateProcessor<DepthProcessorOCV>()); CHECK(ActivateProcessor<DepthProcessorOCV>());
#ifdef WITH_CAM_MODELS #ifdef WITH_CAM_MODELS
} else if (calib_model_ == CalibrationModel::KANNALA_BRANDT) { } else if (calib_model_ == CalibrationModel::KANNALA_BRANDT) {
EnableStreamData(Stream::DISPARITY, depth + 1);
CHECK(ActivateProcessor<DepthProcessor>()); CHECK(ActivateProcessor<DepthProcessor>());
#endif #endif
} else { } else {