From 57fa745be879e9fcbe007651bd190d3a40de3f38 Mon Sep 17 00:00:00 2001
From: AlexeyAB <alexeyab84@gmail.com>
Date: Fri, 04 Aug 2017 20:31:12 +0000
Subject: [PATCH] Fixed speed of SO/DLL
---
src/yolo_v2_class.hpp | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/src/yolo_v2_class.hpp b/src/yolo_v2_class.hpp
index 8330dfc..c6cad84 100644
--- a/src/yolo_v2_class.hpp
+++ b/src/yolo_v2_class.hpp
@@ -11,9 +11,17 @@
#endif // OPENCV
#ifdef YOLODLL_EXPORTS
+#if defined(_MSC_VER)
#define YOLODLL_API __declspec(dllexport)
#else
+#define YOLODLL_API __attribute__((visibility("default")))
+#endif
+#else
+#if defined(_MSC_VER)
#define YOLODLL_API __declspec(dllimport)
+#else
+#define YOLODLL_API
+#endif
#endif
struct bbox_t {
@@ -43,6 +51,8 @@
YOLODLL_API std::vector<bbox_t> detect(image_t img, float thresh = 0.2);
static YOLODLL_API image_t load_image(std::string image_filename);
static YOLODLL_API void free_image(image_t m);
+ YOLODLL_API int get_net_width();
+ YOLODLL_API int get_net_height();
YOLODLL_API std::vector<bbox_t> tracking(std::vector<bbox_t> cur_bbox_vec, int const frames_story = 4);
@@ -51,8 +61,13 @@
{
if(mat.data == NULL)
throw std::runtime_error("file not found");
- auto image_ptr = mat_to_image(mat);
- return detect(*image_ptr, thresh);
+ cv::Mat det_mat;
+ cv::resize(mat, det_mat, cv::Size(get_net_width(), get_net_height()));
+ auto image_ptr = mat_to_image(det_mat);
+ auto detection_boxes = detect(*image_ptr, thresh);
+ float wk = (float)mat.cols / det_mat.cols, hk = (float)mat.rows / det_mat.rows;
+ for (auto &i : detection_boxes) i.x*=wk, i.w*= wk, i.y*=hk, i.h*=hk;
+ return detection_boxes;
}
static std::shared_ptr<image_t> mat_to_image(cv::Mat img)
--
Gitblit v1.10.0