From f762e6adb50d0a7eb72825b322e7d4192ae29ef3 Mon Sep 17 00:00:00 2001
From: Alexey <AlexeyAB@users.noreply.github.com>
Date: Sat, 03 Feb 2018 12:38:31 +0000
Subject: [PATCH] Merge pull request #357 from rajendraarora16/new-changes-darknet
---
src/yolo_v2_class.cpp | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/yolo_v2_class.cpp b/src/yolo_v2_class.cpp
index 518ea65..7e170e5 100644
--- a/src/yolo_v2_class.cpp
+++ b/src/yolo_v2_class.cpp
@@ -252,7 +252,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 +280,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 +302,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