From cc6ab9b3ccf48322b97f7fe096381d5594d198f7 Mon Sep 17 00:00:00 2001
From: AlexeyAB <alexeyab84@gmail.com>
Date: Wed, 24 Jan 2018 16:11:18 +0000
Subject: [PATCH] Added preview boxes for SO/DLL usage
---
src/yolo_console_dll.cpp | 176 ++++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 132 insertions(+), 44 deletions(-)
diff --git a/src/yolo_console_dll.cpp b/src/yolo_console_dll.cpp
index 0e291a4..5da2d90 100644
--- a/src/yolo_console_dll.cpp
+++ b/src/yolo_console_dll.cpp
@@ -11,10 +11,11 @@
#ifdef _WIN32
#define OPENCV
-#include "windows.h"
#endif
-#define TRACK_OPTFLOW
+// To use tracking - uncomment the following line. Tracking is supported only by OpenCV 3.x
+//#define TRACK_OPTFLOW
+
#include "yolo_v2_class.hpp" // imported functions from DLL
#ifdef OPENCV
@@ -37,16 +38,94 @@
#endif
+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;
+}
+
+void draw_preview_boxes(cv::Mat src_mat, cv::Mat draw_mat, std::vector<bbox_t> result_vec)
+{
+ size_t const preview_box_size = 100; // size of preview box in ptx
+ size_t const count_preview_boxes = draw_mat.cols / preview_box_size;
+ unsigned int const frames_history = 30; // how long to keep the history saved
+ struct preview_box_track_t {
+ unsigned int track_id, obj_id, last_showed_frames_ago;
+ cv::Mat mat_obj;
+ preview_box_track_t() : track_id(0), obj_id(0), last_showed_frames_ago(frames_history) {}
+ };
+ static std::vector<preview_box_track_t> preview_box_track_id(count_preview_boxes);
+ // increment frames history
+ for (auto &i : preview_box_track_id)
+ i.last_showed_frames_ago = std::min(frames_history, i.last_showed_frames_ago + 1);
+
+ // occupy empty boxes
+ for (auto &k : result_vec) {
+ bool found = false;
+ for (auto &i : preview_box_track_id) {
+ if (i.track_id == k.track_id) {
+ i.last_showed_frames_ago = 0;
+ found = true;
+ break;
+ }
+ }
+ if (!found) {
+ for (auto &i : preview_box_track_id) {
+ if (i.last_showed_frames_ago == frames_history) {
+ i.track_id = k.track_id;
+ i.obj_id = k.obj_id;
+ i.last_showed_frames_ago = 0;
+ break;
+ }
+ }
+ }
+ }
+
+ // draw preview box (from old or current frame)
+ for (size_t i = 0; i < preview_box_track_id.size(); ++i) {
+
+ // get object image
+ cv::Mat dst = preview_box_track_id[i].mat_obj;
+ for (auto &k : result_vec) {
+ if (preview_box_track_id[i].track_id == k.track_id) {
+ bbox_t b = k;
+ cv::Rect r(b.x, b.y, b.w, b.h);
+ cv::Rect img_rect(cv::Point2i(0, 0), src_mat.size());
+ cv::Rect rect_roi = r & img_rect;
+ if (rect_roi.width > 1 || rect_roi.height > 1) {
+ cv::Mat roi = src_mat(rect_roi);
+ cv::resize(roi, dst, cv::Size(preview_box_size, preview_box_size));
+ preview_box_track_id[i].mat_obj = dst;
+ }
+ break;
+ }
+ }
+
+ // draw object image
+ if (preview_box_track_id[i].last_showed_frames_ago < frames_history &&
+ dst.size() == cv::Size(preview_box_size, preview_box_size))
+ {
+ cv::Rect dst_rect_roi(cv::Point2i(i * preview_box_size, draw_mat.rows - preview_box_size), dst.size());
+ cv::Mat dst_roi = draw_mat(dst_rect_roi);
+ dst.copyTo(dst_roi);
+
+ cv::Scalar color = obj_id_to_color(preview_box_track_id[i].obj_id);
+ cv::rectangle(draw_mat, dst_rect_roi, color, 5);
+ }
+ }
+}
+
+
void draw_boxes(cv::Mat mat_img, std::vector<bbox_t> result_vec, std::vector<std::string> obj_names,
unsigned int wait_msec = 0, int current_det_fps = -1, int current_cap_fps = -1)
{
int const colors[6][3] = { { 1,0,1 },{ 0,0,1 },{ 0,1,1 },{ 0,1,0 },{ 1,1,0 },{ 1,0,0 } };
for (auto &i : result_vec) {
- int const offset = i.obj_id * 123457 % 6;
- int const color_scale = 150 + (i.obj_id * 123457) % 100;
- cv::Scalar color(colors[offset][0], colors[offset][1], colors[offset][2]);
- color *= color_scale;
+ cv::Scalar color = obj_id_to_color(i.obj_id);
cv::rectangle(mat_img, cv::Rect(i.x, i.y, i.w, i.h), color, 5);
if (obj_names.size() > i.obj_id) {
std::string obj_name = obj_names[i.obj_id];
@@ -63,6 +142,7 @@
std::string fps_str = "FPS detection: " + std::to_string(current_det_fps) + " FPS capture: " + std::to_string(current_cap_fps);
putText(mat_img, fps_str, cv::Point2f(10, 20), cv::FONT_HERSHEY_COMPLEX_SMALL, 1.2, cv::Scalar(50, 255, 0), 2);
}
+
cv::imshow("window name", mat_img);
cv::waitKey(wait_msec);
}
@@ -90,17 +170,27 @@
int main(int argc, char *argv[])
{
+ std::string names_file = "data/voc.names";
+ std::string cfg_file = "cfg/yolo-voc.cfg";
+ std::string weights_file = "yolo-voc.weights";
std::string filename;
- if (argc > 1) filename = argv[1];
- Detector detector("cfg/yolo-voc.cfg", "yolo-voc.weights");
- //Detector detector("tiny-yolo-voc_air.cfg", "backup/tiny-yolo-voc_air_5000.weights");
+ if (argc > 4) { //voc.names yolo-voc.cfg yolo-voc.weights test.mp4
+ names_file = argv[1];
+ cfg_file = argv[2];
+ weights_file = argv[3];
+ filename = argv[4];
+ }
+ else if (argc > 1) filename = argv[1];
- auto obj_names = objects_names_from_file("data/voc.names");
+ Detector detector(cfg_file, weights_file);
+
+ auto obj_names = objects_names_from_file(names_file);
std::string out_videofile = "result.avi";
bool const save_output_videofile = false;
#ifdef TRACK_OPTFLOW
Tracker_optflow tracker_flow;
+ detector.wait_stream = true;
#endif
while (true)
@@ -131,7 +221,7 @@
int current_det_fps = 0, current_cap_fps = 0;
std::thread t_detect, t_cap, t_videowrite;
std::mutex mtx;
- std::condition_variable cv;
+ std::condition_variable cv_detected, cv_pre_tracked;
std::chrono::steady_clock::time_point steady_start, steady_end;
cv::VideoCapture cap(filename); cap >> cur_frame;
int const video_fps = cap.get(CV_CAP_PROP_FPS);
@@ -153,35 +243,31 @@
// swap result bouned-boxes and input-frame
if(consumed)
{
- {
- std::unique_lock<std::mutex> lock(mtx);
- det_image = detector.mat_to_image_resize(cur_frame);
- result_vec = thread_result_vec;
- result_vec = detector.tracking(result_vec); // comment it - if track_id is not required
- consumed = false;
-
+ std::unique_lock<std::mutex> lock(mtx);
+ det_image = detector.mat_to_image_resize(cur_frame);
+ result_vec = thread_result_vec;
+ result_vec = detector.tracking(result_vec); // comment it - if track_id is not required
#ifdef TRACK_OPTFLOW
- // track optical flow
- if (track_optflow_queue.size() > 0) {
- std::queue<cv::Mat> new_track_optflow_queue;
- //std::cout << "\n !!!! all = " << track_optflow_queue.size() << ", cur = " << passed_flow_frames << std::endl;
- tracker_flow.update_tracking_flow(track_optflow_queue.front());
+ // track optical flow
+ if (track_optflow_queue.size() > 0) {
+ //draw_preview_boxes(track_optflow_queue.front(), cur_frame, result_vec);
+ std::queue<cv::Mat> new_track_optflow_queue;
+ //std::cout << "\n !!!! all = " << track_optflow_queue.size() << ", cur = " << passed_flow_frames << std::endl;
+ tracker_flow.update_tracking_flow(track_optflow_queue.front());
+
+ while (track_optflow_queue.size() > 1) {
track_optflow_queue.pop();
- while (track_optflow_queue.size() > 0) {
- result_vec = tracker_flow.tracking_flow(track_optflow_queue.front(), result_vec);
- if (track_optflow_queue.size() <= passed_flow_frames && new_track_optflow_queue.size() == 0)
- new_track_optflow_queue = track_optflow_queue;
-
- track_optflow_queue.pop();
- }
- track_optflow_queue = new_track_optflow_queue;
- new_track_optflow_queue.swap(std::queue<cv::Mat>());
- passed_flow_frames = 0;
+ result_vec = tracker_flow.tracking_flow(track_optflow_queue.front(), result_vec);
+ if (track_optflow_queue.size() <= passed_flow_frames && new_track_optflow_queue.size() == 0)
+ new_track_optflow_queue = track_optflow_queue;
}
+ track_optflow_queue = new_track_optflow_queue;
+ passed_flow_frames = 0;
}
#endif
-
+ consumed = false;
+ cv_pre_tracked.notify_all();
}
// launch thread once - Detection
if (!t_detect.joinable()) {
@@ -189,15 +275,15 @@
auto current_image = det_image;
consumed = true;
while (current_image.use_count() > 0) {
- auto result = detector.detect_resized(*current_image, frame_size, 0.24, false); // true
- //Sleep(200);
- Sleep(50);
+ auto result = detector.detect_resized(*current_image, frame_size, 0.20, false); // true
++fps_det_counter;
std::unique_lock<std::mutex> lock(mtx);
thread_result_vec = result;
current_image = det_image;
consumed = true;
- cv.notify_all();
+ cv_detected.notify_all();
+ if(detector.wait_stream)
+ while (consumed) cv_pre_tracked.wait(lock);
}
});
}
@@ -217,8 +303,8 @@
track_optflow_queue.push(cur_frame.clone());
result_vec = tracker_flow.tracking_flow(cur_frame, result_vec); // track optical flow
#endif
-
- draw_boxes(cur_frame, result_vec, obj_names, 3, current_det_fps, current_cap_fps);
+ //draw_preview_boxes(cur_frame, cur_frame, result_vec);
+ draw_boxes(cur_frame, result_vec, obj_names, 3, current_det_fps, current_cap_fps); // 3 or 16ms
//show_console_result(result_vec, obj_names);
if (output_video.isOpened() && videowrite_ready) {
@@ -231,11 +317,13 @@
}
}
+#ifndef TRACK_OPTFLOW
// wait detection result for video-file only (not for net-cam)
- //if (protocol != "rtsp://" && protocol != "http://" && protocol != "https:/") {
- // std::unique_lock<std::mutex> lock(mtx);
- // while (!consumed) cv.wait(lock);
- //}
+ if (protocol != "rtsp://" && protocol != "http://" && protocol != "https:/") {
+ std::unique_lock<std::mutex> lock(mtx);
+ while (!consumed) cv_detected.wait(lock);
+ }
+#endif
}
if (t_cap.joinable()) t_cap.join();
if (t_detect.joinable()) t_detect.join();
--
Gitblit v1.10.0