From 892860e84e161457745ec0130f31c4313451b819 Mon Sep 17 00:00:00 2001
From: Howard Stark <howard@getcoffee.io>
Date: Mon, 19 Feb 2018 06:04:01 +0000
Subject: [PATCH] Added CPU Optical Flow
---
src/yolo_v2_class.cpp | 22 ++++++++++++++++++----
1 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/src/yolo_v2_class.cpp b/src/yolo_v2_class.cpp
index 518ea65..1a5ccac 100644
--- a/src/yolo_v2_class.cpp
+++ b/src/yolo_v2_class.cpp
@@ -33,6 +33,17 @@
unsigned int *track_id;
};
+#ifdef OPENCV
+cv::Scalar obj_id_to_color(int obj_id)
+{
+ int const colors[6][3] = { { 1,0,1 },{ 0,0,1 },{ 0,1,1 },{ 0,1,0 },{ 1,1,0 },{ 1,0,0 } };
+ int const offset = obj_id * 123457 % 6;
+ int const color_scale = 150 + (obj_id * 123457) % 100;
+ cv::Scalar color(colors[offset][0], colors[offset][1], colors[offset][2]);
+ color *= color_scale;
+ return color;
+}
+#endif
YOLODLL_API Detector::Detector(std::string cfg_filename, std::string weight_filename, int gpu_id) : cur_gpu_id(gpu_id)
{
@@ -252,7 +263,8 @@
return bbox_vec;
}
-YOLODLL_API std::vector<bbox_t> Detector::tracking(std::vector<bbox_t> cur_bbox_vec, int const frames_story)
+YOLODLL_API std::vector<bbox_t> Detector::tracking_id(std::vector<bbox_t> cur_bbox_vec, bool const change_history,
+ int const frames_story, int const max_dist)
{
detector_gpu_t &det_gpu = *reinterpret_cast<detector_gpu_t *>(detector_gpu_ptr.get());
@@ -279,7 +291,7 @@
float center_x_diff = (float)(i.x + i.w/2) - (float)(k.x + k.w/2);
float center_y_diff = (float)(i.y + i.h/2) - (float)(k.y + k.h/2);
unsigned int cur_dist = sqrt(center_x_diff*center_x_diff + center_y_diff*center_y_diff);
- if (cur_dist < 100 && (k.track_id == 0 || dist_vec[m] > cur_dist)) {
+ if (cur_dist < max_dist && (k.track_id == 0 || dist_vec[m] > cur_dist)) {
dist_vec[m] = cur_dist;
cur_index = m;
}
@@ -301,8 +313,10 @@
if (cur_bbox_vec[i].track_id == 0)
cur_bbox_vec[i].track_id = det_gpu.track_id[cur_bbox_vec[i].obj_id]++;
- prev_bbox_vec_deque.push_front(cur_bbox_vec);
- if (prev_bbox_vec_deque.size() > frames_story) prev_bbox_vec_deque.pop_back();
+ if (change_history) {
+ prev_bbox_vec_deque.push_front(cur_bbox_vec);
+ if (prev_bbox_vec_deque.size() > frames_story) prev_bbox_vec_deque.pop_back();
+ }
return cur_bbox_vec;
}
\ No newline at end of file
--
Gitblit v1.10.0