From e325706c9dd5e65a47c4b97d6924078797b9870e Mon Sep 17 00:00:00 2001 From: TinyOh Date: Fri, 15 Mar 2019 09:44:44 +0800 Subject: [PATCH] fix(api): update version checker to new sdk version --- samples/tutorials/data/get_disparity.cc | 20 ++++++++--------- src/mynteye/api/processor/depth_processor.h | 6 ++--- .../disparity_normalized_processor.h | 12 +++++----- src/mynteye/api/processor/points_processor.h | 6 ++--- .../api/processor/points_processor_ocv.h | 12 +++++----- src/mynteye/api/processor/rectify_processor.h | 12 +++++----- .../api/processor/rectify_processor_ocv.h | 12 +++++----- .../api/processor/root_camera_processor.h | 12 +++++----- src/mynteye/api/version_checker.cc | 22 ++++++++++++------- 9 files changed, 60 insertions(+), 54 deletions(-) diff --git a/samples/tutorials/data/get_disparity.cc b/samples/tutorials/data/get_disparity.cc index b5f1fd5..ff9ae4a 100644 --- a/samples/tutorials/data/get_disparity.cc +++ b/samples/tutorials/data/get_disparity.cc @@ -34,8 +34,8 @@ int main(int argc, char *argv[]) { api->Start(Source::VIDEO_STREAMING); cv::namedWindow("frame"); - // cv::namedWindow("disparity"); - cv::namedWindow("disparity_normalized"); + cv::namedWindow("disparity"); + // cv::namedWindow("disparity_normalized"); while (true) { api->WaitForStreams(); @@ -49,16 +49,16 @@ int main(int argc, char *argv[]) { cv::imshow("frame", img); } - // auto &&disp_data = api->GetStreamData(Stream::DISPARITY); - // if (!disp_data.frame.empty()) { - // cv::imshow("disparity", disp_data.frame); - // } - - auto &&disp_norm_data = api->GetStreamData(Stream::DISPARITY_NORMALIZED); - if (!disp_norm_data.frame.empty()) { - cv::imshow("disparity_normalized", disp_norm_data.frame); // CV_8UC1 + auto &&disp_data = api->GetStreamData(Stream::DISPARITY); + if (!disp_data.frame.empty()) { + cv::imshow("disparity", disp_data.frame); } + // auto &&disp_norm_data = api->GetStreamData(Stream::DISPARITY_NORMALIZED); + // if (!disp_norm_data.frame.empty()) { + // cv::imshow("disparity_normalized", disp_norm_data.frame); // CV_8UC1 + // } + char key = static_cast(cv::waitKey(1)); if (key == 27 || key == 'q' || key == 'Q') { // ESC/Q break; diff --git a/src/mynteye/api/processor/depth_processor.h b/src/mynteye/api/processor/depth_processor.h index 456893c..0583c6a 100644 --- a/src/mynteye/api/processor/depth_processor.h +++ b/src/mynteye/api/processor/depth_processor.h @@ -34,9 +34,9 @@ class DepthProcessor : public Processor { std::string Name() override; protected: - inline Processor::process_type ProcessInputConnection() override { - return Processor::WITHOUT_CLONE; - } + // inline Processor::process_type ProcessInputConnection() override { + // return Processor::WITHOUT_CLONE; + // } Object *OnCreateOutput() override; bool OnProcess( Object *const in, Object *const out, diff --git a/src/mynteye/api/processor/disparity_normalized_processor.h b/src/mynteye/api/processor/disparity_normalized_processor.h index 9c9fb0b..52fcd44 100644 --- a/src/mynteye/api/processor/disparity_normalized_processor.h +++ b/src/mynteye/api/processor/disparity_normalized_processor.h @@ -31,12 +31,12 @@ class DisparityNormalizedProcessor : public Processor { std::string Name() override; protected: - inline Processor::process_type ProcessOutputConnection() override { - return Processor::WITHOUT_CLONE; - } - inline Processor::process_type ProcessInputConnection() override { - return Processor::WITHOUT_CLONE; - } + // inline Processor::process_type ProcessOutputConnection() override { + // return Processor::WITHOUT_CLONE; + // } + // inline Processor::process_type ProcessInputConnection() override { + // return Processor::WITHOUT_CLONE; + // } Object *OnCreateOutput() override; bool OnProcess( Object *const in, Object *const out, diff --git a/src/mynteye/api/processor/points_processor.h b/src/mynteye/api/processor/points_processor.h index b9d1ab9..38de982 100644 --- a/src/mynteye/api/processor/points_processor.h +++ b/src/mynteye/api/processor/points_processor.h @@ -36,9 +36,9 @@ class PointsProcessor : public Processor { std::string Name() override; protected: - inline Processor::process_type ProcessOutputConnection() override { - return Processor::WITHOUT_CLONE; - } + // inline Processor::process_type ProcessOutputConnection() override { + // return Processor::WITHOUT_CLONE; + // } Object *OnCreateOutput() override; bool OnProcess( Object *const in, Object *const out, diff --git a/src/mynteye/api/processor/points_processor_ocv.h b/src/mynteye/api/processor/points_processor_ocv.h index 0aa22da..8275154 100644 --- a/src/mynteye/api/processor/points_processor_ocv.h +++ b/src/mynteye/api/processor/points_processor_ocv.h @@ -37,12 +37,12 @@ class PointsProcessorOCV : public Processor { bool OnProcess( Object *const in, Object *const out, std::shared_ptr const parent) override; - inline Processor::process_type ProcessOutputConnection() override { - return Processor::WITHOUT_CLONE; - } - inline Processor::process_type ProcessInputConnection() override { - return Processor::WITHOUT_CLONE; - } + // inline Processor::process_type ProcessOutputConnection() override { + // return Processor::WITHOUT_CLONE; + // } + // inline Processor::process_type ProcessInputConnection() override { + // return Processor::WITHOUT_CLONE; + // } private: cv::Mat Q_; diff --git a/src/mynteye/api/processor/rectify_processor.h b/src/mynteye/api/processor/rectify_processor.h index 3ddb504..d5b21d7 100644 --- a/src/mynteye/api/processor/rectify_processor.h +++ b/src/mynteye/api/processor/rectify_processor.h @@ -79,12 +79,12 @@ class RectifyProcessor : public Processor { bool OnProcess( Object *const in, Object *const out, std::shared_ptr const parent) override; - inline Processor::process_type ProcessOutputConnection() override { - return Processor::WITHOUT_CLONE; - } - inline Processor::process_type ProcessInputConnection() override { - return Processor::WITHOUT_CLONE; - } +// inline Processor::process_type ProcessOutputConnection() override { +// return Processor::WITHOUT_CLONE; +// } +// inline Processor::process_type ProcessInputConnection() override { +// return Processor::WITHOUT_CLONE; +// } private: void InitParams(IntrinsicsEquidistant in_left, diff --git a/src/mynteye/api/processor/rectify_processor_ocv.h b/src/mynteye/api/processor/rectify_processor_ocv.h index 19e1ca7..adf113d 100644 --- a/src/mynteye/api/processor/rectify_processor_ocv.h +++ b/src/mynteye/api/processor/rectify_processor_ocv.h @@ -49,12 +49,12 @@ class RectifyProcessorOCV : public Processor { cv::Mat map11, map12, map21, map22; protected: - inline Processor::process_type ProcessOutputConnection() override { - return Processor::WITHOUT_CLONE; - } - inline Processor::process_type ProcessInputConnection() override { - return Processor::WITHOUT_CLONE; - } + // inline Processor::process_type ProcessOutputConnection() override { + // return Processor::WITHOUT_CLONE; + // } + // inline Processor::process_type ProcessInputConnection() override { + // return Processor::WITHOUT_CLONE; + // } Object *OnCreateOutput() override; bool OnProcess( diff --git a/src/mynteye/api/processor/root_camera_processor.h b/src/mynteye/api/processor/root_camera_processor.h index 469067a..23cdf31 100644 --- a/src/mynteye/api/processor/root_camera_processor.h +++ b/src/mynteye/api/processor/root_camera_processor.h @@ -56,12 +56,12 @@ class s1s2Processor : public RootProcessor { api::StreamData GetStreamData(const Stream &stream) override; std::vector GetStreamDatas(const Stream &stream) override; // NOLINT protected: - inline Processor::process_type ProcessOutputConnection() override { - return Processor::WITHOUT_CLONE; - } - inline Processor::process_type ProcessInputConnection() override { - return Processor::WITHOUT_CLONE; - } + // inline Processor::process_type ProcessOutputConnection() override { + // return Processor::WITHOUT_CLONE; + // } + // inline Processor::process_type ProcessInputConnection() override { + // return Processor::WITHOUT_CLONE; + // } Object *OnCreateOutput() override; bool OnProcess( Object *const in, Object *const out, diff --git a/src/mynteye/api/version_checker.cc b/src/mynteye/api/version_checker.cc index cfa931b..660b85a 100644 --- a/src/mynteye/api/version_checker.cc +++ b/src/mynteye/api/version_checker.cc @@ -40,16 +40,22 @@ const char* PASS_OUTOF_TABLE_WARNING = "You're using a custom mynteye device"; /**----device type-----sdk version---firmware version-----pass tag-----*/ static const firmware_version_match_table_unit FSVM_TABLE[] ={ /** S1030 */ - {"MYNT-EYE-S1030", ">2.3.0", ">2.2.0", PASS_DESCRIPTION}, - {"MYNT-EYE-S1030", ">2.3.0", "2.2.0", WARN_DESCRIPTION_F}, - {"MYNT-EYE-S1030", ">2.3.0", "<2.2.0", ERRO_DESCRIPTION_F}, - {"MYNT-EYE-S1030", "<2.3.1", "<2.2.0", WARN_DESCRIPTION_S}, + {"MYNT-EYE-S1030", ">2.3.3", ">2.3.0", PASS_DESCRIPTION}, + {"MYNT-EYE-S1030", ">2.3.3", "<2.4.0", WARN_DESCRIPTION_F}, + {"MYNT-EYE-S1030", ">0.0.0", ">2.2.0", PASS_DESCRIPTION}, + {"MYNT-EYE-S1030", ">0.0.0", "<2.3.0", WARN_DESCRIPTION_F}, /** S2100 */ - {"MYNT-EYE-S2100", ">2.3.0", ">0.0", PASS_DESCRIPTION}, - {"MYNT-EYE-S2100", "<2.3.1", ">0.0", WARN_DESCRIPTION_S}, + {"MYNT-EYE-S2100", ">2.3.3", ">1.0", PASS_DESCRIPTION}, + {"MYNT-EYE-S2100", ">2.3.3", "<1.1", WARN_DESCRIPTION_F}, + {"MYNT-EYE-S2100", ">2.3.0", ">0.9", PASS_DESCRIPTION}, + {"MYNT-EYE-S2100", ">0.0.0", ">0.9", WARN_DESCRIPTION_S}, + {"MYNT-EYE-S2100", ">0.0.0", "<1.0", WARN_DESCRIPTION_F}, /** S210A */ - {"MYNT-EYE-S210A", ">2.3.0", ">0.0", PASS_DESCRIPTION}, - {"MYNT-EYE-S210A", "<2.3.1", ">0.0", WARN_DESCRIPTION_S}, + {"MYNT-EYE-S210A", ">2.3.3", ">1.0", PASS_DESCRIPTION}, + {"MYNT-EYE-S210A", ">2.3.3", "<1.1", WARN_DESCRIPTION_F}, + {"MYNT-EYE-S210A", ">2.3.0", ">0.9", PASS_DESCRIPTION}, + {"MYNT-EYE-S210A", ">0.0.0", ">0.9", WARN_DESCRIPTION_S}, + {"MYNT-EYE-S210A", ">0.0.0", "<1.0", WARN_DESCRIPTION_F}, }; void getVersion(const std::string &str, char *version) {