From fd671a7a4a8f018e449966a8ada5020de702d742 Mon Sep 17 00:00:00 2001
From: AlexeyAB <kikots@mail.ru>
Date: Fri, 04 Aug 2017 14:57:05 +0000
Subject: [PATCH] LIBSO=1 compile darknet.so library on Linux
---
src/yolo_v2_class.hpp | 30 +++++++++++++++++++++++-------
1 files changed, 23 insertions(+), 7 deletions(-)
diff --git a/src/yolo_v2_class.hpp b/src/yolo_v2_class.hpp
index e3d7933..9a8baa6 100644
--- a/src/yolo_v2_class.hpp
+++ b/src/yolo_v2_class.hpp
@@ -1,6 +1,8 @@
#pragma once
#include <memory>
#include <vector>
+#include <deque>
+#include <algorithm>
#ifdef OPENCV
#include <opencv2/opencv.hpp> // C++
@@ -9,15 +11,24 @@
#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 {
unsigned int x, y, w, h; // (x,y) - top-left corner, (w, h) - width & height of bounded box
float prob; // confidence - probability that the object was found correctly
unsigned int obj_id; // class of object - from range [0, classes-1]
+ unsigned int track_id; // tracking id for video (0 - untracked, 1 - inf - tracked object)
};
struct image_t {
@@ -31,6 +42,7 @@
class Detector {
std::shared_ptr<void> detector_gpu_ptr;
public:
+ float nms = .4;
YOLODLL_API Detector(std::string cfg_filename, std::string weight_filename, int gpu_id = 0);
YOLODLL_API ~Detector();
@@ -40,25 +52,27 @@
static YOLODLL_API image_t load_image(std::string image_filename);
static YOLODLL_API void free_image(image_t m);
+ YOLODLL_API std::vector<bbox_t> tracking(std::vector<bbox_t> cur_bbox_vec, int const frames_story = 4);
+
#ifdef OPENCV
std::vector<bbox_t> detect(cv::Mat mat, float thresh = 0.2)
{
if(mat.data == NULL)
throw std::runtime_error("file not found");
- std::shared_ptr<image_t> image_ptr(new image_t, [](image_t *img) { free_image(*img); delete img; });
- *image_ptr = mat_to_image(mat);
+ auto image_ptr = mat_to_image(mat);
return detect(*image_ptr, thresh);
}
-private:
- static image_t mat_to_image(cv::Mat img)
+ static std::shared_ptr<image_t> mat_to_image(cv::Mat img)
{
+ std::shared_ptr<image_t> image_ptr(new image_t, [](image_t *img) { free_image(*img); delete img; });
std::shared_ptr<IplImage> ipl_small = std::make_shared<IplImage>(img);
- image_t im_small = ipl_to_image(ipl_small.get());
- rgbgr_image(im_small);
- return im_small;
+ *image_ptr = ipl_to_image(ipl_small.get());
+ rgbgr_image(*image_ptr);
+ return image_ptr;
}
+private:
static image_t ipl_to_image(IplImage* src)
{
unsigned char *data = (unsigned char *)src->imageData;
@@ -107,6 +121,8 @@
}
#endif // OPENCV
+
+ std::deque<std::vector<bbox_t>> prev_bbox_vec_deque;
};
--
Gitblit v1.10.0