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

refactor(calib models): delete new unused things

Browse Source
This commit is contained in:
TinyOh 2019-01-09 11:03:13 +08:00
parent 3978264c50
commit 9474528972
4 changed files with 11 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/mynteye/api/processor/depth_processor.cc
View File

@ -41,13 +41,13 @@ Object *DepthProcessor::OnCreateOutput() {
bool DepthProcessor::OnProcess( bool DepthProcessor::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)
const ObjMat *input = Object::Cast<ObjMat>(in); // const ObjMat *input = Object::Cast<ObjMat>(in);
ObjMat *output = Object::Cast<ObjMat>(out); // ObjMat *output = Object::Cast<ObjMat>(out);
cv::Mat channels[3 /*input->value.channels()*/]; // cv::Mat channels[3 /*input->value.channels()*/];
cv::split(input->value, channels); // cv::split(input->value, channels);
channels[2].convertTo(output->value, CV_16UC1); // channels[2].convertTo(output->value, CV_16UC1);
output->id = input->id; // output->id = input->id;
output->data = input->data; // output->data = input->data;
return true; return true;
} }

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

@ -23,8 +23,8 @@ MYNTEYE_BEGIN_NAMESPACE
const char PointsProcessor::NAME[] = "PointsProcessor"; const char PointsProcessor::NAME[] = "PointsProcessor";
PointsProcessor::PointsProcessor(cv::Mat Q, std::int32_t proc_period) PointsProcessor::PointsProcessor(std::int32_t proc_period)
: Processor(std::move(proc_period)), Q_(std::move(Q)) { : Processor(std::move(proc_period)) {
VLOG(2) << __func__ << ": proc_period=" << proc_period; VLOG(2) << __func__ << ": proc_period=" << proc_period;
} }
@ -42,16 +42,6 @@ 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) {
#ifdef WITH_CAM_MODELS
#else
MYNTEYE_UNUSED(parent)
const ObjMat *input = Object::Cast<ObjMat>(in);
ObjMat *output = Object::Cast<ObjMat>(out);
cv::reprojectImageTo3D(input->value, output->value, Q_, true);
output->id = input->id;
output->data = input->data;
#endif
return true; return true;
} }

2
src/mynteye/api/processor/points_processor.h
View File

@ -27,7 +27,7 @@ class PointsProcessor : public Processor {
public: public:
static const char NAME[]; static const char NAME[];
explicit PointsProcessor(cv::Mat Q, std::int32_t proc_period = 0); explicit PointsProcessor(std::int32_t proc_period = 0);
virtual ~PointsProcessor(); virtual ~PointsProcessor();
std::string Name() override; std::string Name() override;

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

@ -484,7 +484,7 @@ void Synthetic::InitProcessors() {
points_processor = points_processor_pin; points_processor = points_processor_pin;
} else if (calib_model_ == CalibrationModel::KANNALA_BRANDT) { } else if (calib_model_ == CalibrationModel::KANNALA_BRANDT) {
auto &&points_processor_kan = std::make_shared<PointsProcessor>( auto &&points_processor_kan = std::make_shared<PointsProcessor>(
rectify_processor->Q, POINTS_PROC_PERIOD); POINTS_PROC_PERIOD);
points_processor = points_processor_kan; points_processor = points_processor_kan;
} else { } else {
LOG(ERROR) << "Unknow calib model type in device: " LOG(ERROR) << "Unknow calib model type in device: "