From 4373f897f1a5efd1a58746c44430dc33df925415 Mon Sep 17 00:00:00 2001
From: AlexeyAB <alexeyab84@gmail.com>
Date: Wed, 07 Feb 2018 22:07:19 +0000
Subject: [PATCH] Fixed densenet201_yolo.cfg - burn_in and poly policy, that changes learning rate
---
src/yolo_console_dll.cpp | 158 ++++++++++++++++++++++++++++++++++++----------------
1 files changed, 108 insertions(+), 50 deletions(-)
diff --git a/src/yolo_console_dll.cpp b/src/yolo_console_dll.cpp
index 50dee7e..b524d68 100644
--- a/src/yolo_console_dll.cpp
+++ b/src/yolo_console_dll.cpp
@@ -52,20 +52,22 @@
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) {}
+ bool current_detection;
+ bbox_t bbox;
+ cv::Mat mat_obj, mat_resized_obj;
+ preview_box_track_t() : track_id(0), obj_id(0), last_showed_frames_ago(frames_history), current_detection(false){}
};
std::vector<preview_box_track_t> preview_box_track_id;
- size_t const preview_box_size, const bottom_offset;
+ size_t const preview_box_size, bottom_offset;
bool const one_off_detections;
public:
preview_boxes_t(size_t _preview_box_size = 100, size_t _bottom_offset = 100, bool _one_off_detections = false) :
preview_box_size(_preview_box_size), bottom_offset(_bottom_offset), one_off_detections(_one_off_detections)
{}
- void draw_preview_boxes(cv::Mat src_mat, cv::Mat draw_mat, std::vector<bbox_t> result_vec, bool draw_boxes = true)
+ void set(cv::Mat src_mat, std::vector<bbox_t> result_vec)
{
- size_t const count_preview_boxes = draw_mat.cols / preview_box_size;
+ size_t const count_preview_boxes = src_mat.cols / preview_box_size;
if (preview_box_track_id.size() != count_preview_boxes) preview_box_track_id.resize(count_preview_boxes);
// increment frames history
@@ -75,20 +77,22 @@
// occupy empty boxes
for (auto &k : result_vec) {
bool found = false;
+ // find the same (track_id)
for (auto &i : preview_box_track_id) {
if (i.track_id == k.track_id) {
- if(!one_off_detections)
- i.last_showed_frames_ago = 0;
+ if (!one_off_detections) i.last_showed_frames_ago = 0; // for tracked objects
found = true;
break;
}
}
if (!found) {
+ // find empty box
for (auto &i : preview_box_track_id) {
if (i.last_showed_frames_ago == frames_history) {
- if (!one_off_detections && k.frames_counter == 0) break;
+ if (!one_off_detections && k.frames_counter == 0) break; // don't show if obj isn't tracked yet
i.track_id = k.track_id;
i.obj_id = k.obj_id;
+ i.bbox = k;
i.last_showed_frames_ago = 0;
break;
}
@@ -100,12 +104,14 @@
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;
- bool current_detection = false;
+ cv::Mat dst = preview_box_track_id[i].mat_resized_obj;
+ preview_box_track_id[i].current_detection = false;
for (auto &k : result_vec) {
if (preview_box_track_id[i].track_id == k.track_id) {
- if (one_off_detections && preview_box_track_id[i].last_showed_frames_ago > 0) break;
+ if (one_off_detections && preview_box_track_id[i].last_showed_frames_ago > 0) {
+ preview_box_track_id[i].last_showed_frames_ago = frames_history; break;
+ }
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());
@@ -113,26 +119,61 @@
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.clone();
- current_detection = true;
+ preview_box_track_id[i].mat_obj = roi.clone();
+ preview_box_track_id[i].mat_resized_obj = dst.clone();
+ preview_box_track_id[i].current_detection = true;
+ preview_box_track_id[i].bbox = k;
}
break;
}
}
+ }
+ }
+
+
+ void draw(cv::Mat draw_mat, bool show_small_boxes = false)
+ {
+ // draw preview box (from old or current frame)
+ for (size_t i = 0; i < preview_box_track_id.size(); ++i)
+ {
+ auto &prev_box = preview_box_track_id[i];
// draw object image
- if (draw_boxes) {
- cv::Mat dst = preview_box_track_id[i].mat_obj;
- 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 - bottom_offset), dst.size());
- cv::Mat dst_roi = draw_mat(dst_rect_roi);
- dst.copyTo(dst_roi);
+ cv::Mat dst = prev_box.mat_resized_obj;
+ if (prev_box.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 - bottom_offset), 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);
- int thickness = (current_detection) ? 5 : 1;
- cv::rectangle(draw_mat, dst_rect_roi, color, thickness);
+ cv::Scalar color = obj_id_to_color(prev_box.obj_id);
+ int thickness = (prev_box.current_detection) ? 5 : 1;
+ cv::rectangle(draw_mat, dst_rect_roi, color, thickness);
+
+ unsigned int const track_id = prev_box.track_id;
+ std::string track_id_str = (track_id > 0)? std::to_string(track_id):"";
+ putText(draw_mat, track_id_str, dst_rect_roi.tl() - cv::Point2i(0, 10), cv::FONT_HERSHEY_COMPLEX_SMALL, 1.0, cv::Scalar(0, 0, 0), 2);
+
+ std::string size_str = std::to_string(prev_box.bbox.w) + "x" + std::to_string(prev_box.bbox.h);
+ putText(draw_mat, size_str, dst_rect_roi.tl() + cv::Point2i(0, 12), cv::FONT_HERSHEY_COMPLEX_SMALL, 0.8, cv::Scalar(0, 0, 0), 1);
+
+ if (!one_off_detections && prev_box.current_detection) {
+ cv::line(draw_mat, dst_rect_roi.tl() + cv::Point2i(preview_box_size, 0),
+ cv::Point2i(prev_box.bbox.x, prev_box.bbox.y + prev_box.bbox.h),
+ color);
+ }
+
+ if (one_off_detections && show_small_boxes) {
+ cv::Rect src_rect_roi(cv::Point2i(prev_box.bbox.x, prev_box.bbox.y),
+ cv::Size(prev_box.bbox.w, prev_box.bbox.h));
+ unsigned int const color_history = (255 * prev_box.last_showed_frames_ago) / frames_history;
+ color = cv::Scalar(255 - 3* color_history, 255 - 2 * color_history, 255 - 1 * color_history);
+ if (prev_box.mat_obj.size() == src_rect_roi.size()) {
+ prev_box.mat_obj.copyTo(draw_mat(src_rect_roi));
+ }
+ cv::rectangle(draw_mat, src_rect_roi, color, thickness);
+ putText(draw_mat, track_id_str, src_rect_roi.tl() - cv::Point2i(0, 10), cv::FONT_HERSHEY_COMPLEX_SMALL, 0.8, cv::Scalar(0, 0, 0), 1);
}
}
}
@@ -141,7 +182,7 @@
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 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 } };
@@ -163,9 +204,6 @@
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);
}
#endif // OPENCV
@@ -204,6 +242,8 @@
}
else if (argc > 1) filename = argv[1];
+ float const thresh = (argc > 5) ? std::stof(argv[5]) : 0.20;
+
Detector detector(cfg_file, weights_file);
auto obj_names = objects_names_from_file(names_file);
@@ -213,7 +253,6 @@
Tracker_optflow tracker_flow;
detector.wait_stream = true;
#endif
- preview_boxes_t large_preview(100, 150, false), small_preview(50, 50, true);
while (true)
{
@@ -223,6 +262,9 @@
try {
#ifdef OPENCV
+ preview_boxes_t large_preview(100, 150, false), small_preview(50, 50, true);
+ bool show_small_boxes = false;
+
std::string const file_ext = filename.substr(filename.find_last_of(".") + 1);
std::string const protocol = filename.substr(0, 7);
if (file_ext == "avi" || file_ext == "mp4" || file_ext == "mjpg" || file_ext == "mov" || // video file
@@ -267,28 +309,31 @@
{
std::unique_lock<std::mutex> lock(mtx);
det_image = detector.mat_to_image_resize(cur_frame);
- auto old_result_vec = result_vec;
- result_vec = thread_result_vec;
- result_vec = detector.tracking_id(result_vec); // comment it - if track_id is not required
+ //auto old_result_vec = result_vec;
+ auto old_result_vec = detector.tracking_id(result_vec);
+ auto detected_result_vec = thread_result_vec;
+ result_vec = detected_result_vec;
#ifdef TRACK_OPTFLOW
// track optical flow
if (track_optflow_queue.size() > 0) {
- small_preview.draw_preview_boxes(track_optflow_queue.front(), cur_frame, result_vec, false);
-
- 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());
+ cv::Mat first_frame = track_optflow_queue.front();
+ tracker_flow.update_tracking_flow(track_optflow_queue.front(), result_vec);
while (track_optflow_queue.size() > 1) {
track_optflow_queue.pop();
- 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;
+ result_vec = tracker_flow.tracking_flow(track_optflow_queue.front(), false);
}
- track_optflow_queue = new_track_optflow_queue;
+ track_optflow_queue.pop();
passed_flow_frames = 0;
+
+ result_vec = detector.tracking_id(result_vec);
+ auto tmp_result_vec = detector.tracking_id(detected_result_vec);
+ small_preview.set(first_frame, tmp_result_vec);
}
#endif
+ result_vec = detector.tracking_id(result_vec); // comment it - if track_id is not required
+
// add old tracked objects
for (auto &i : old_result_vec) {
auto it = std::find_if(result_vec.begin(), result_vec.end(),
@@ -298,10 +343,14 @@
if (i.frames_counter-- > 1)
result_vec.push_back(i);
}
- else
+ else {
it->frames_counter = std::min((unsigned)3, i.frames_counter + 1);
+ }
}
-
+#ifdef TRACK_OPTFLOW
+ tracker_flow.update_cur_bbox_vec(result_vec);
+ result_vec = tracker_flow.tracking_flow(cur_frame, false); // track optical flow
+#endif
consumed = false;
cv_pre_tracked.notify_all();
}
@@ -311,18 +360,20 @@
auto current_image = det_image;
consumed = true;
while (current_image.use_count() > 0) {
- auto result = detector.detect_resized(*current_image, frame_size, 0.20, false); // true
+ auto result = detector.detect_resized(*current_image, frame_size, thresh, false); // true
++fps_det_counter;
std::unique_lock<std::mutex> lock(mtx);
thread_result_vec = result;
- current_image = det_image;
consumed = true;
cv_detected.notify_all();
- if(detector.wait_stream)
+ if (detector.wait_stream) {
while (consumed) cv_pre_tracked.wait(lock);
+ }
+ current_image = det_image;
}
});
}
+ //while (!consumed); // sync detection
if (!cur_frame.empty()) {
steady_end = std::chrono::steady_clock::now();
@@ -334,16 +385,21 @@
fps_cap_counter = 0;
}
+ large_preview.set(cur_frame, result_vec);
#ifdef TRACK_OPTFLOW
++passed_flow_frames;
track_optflow_queue.push(cur_frame.clone());
- result_vec = tracker_flow.tracking_flow(cur_frame, result_vec, true); // track optical flow
- small_preview.draw_preview_boxes(cur_frame.clone(), cur_frame, result_vec, true);
-#endif
- large_preview.draw_preview_boxes(cur_frame.clone(), cur_frame, result_vec, true);
+ result_vec = tracker_flow.tracking_flow(cur_frame); // track optical flow
+ small_preview.draw(cur_frame, show_small_boxes);
+#endif
- draw_boxes(cur_frame, result_vec, obj_names, 3, current_det_fps, current_cap_fps); // 3 or 16ms
+ draw_boxes(cur_frame, result_vec, obj_names, current_det_fps, current_cap_fps);
//show_console_result(result_vec, obj_names);
+ large_preview.draw(cur_frame);
+
+ cv::imshow("window name", cur_frame);
+ int key = cv::waitKey(3); // 3 or 16ms
+ if (key == 'f') show_small_boxes = !show_small_boxes;
if (output_video.isOpened() && videowrite_ready) {
if (t_videowrite.joinable()) t_videowrite.join();
@@ -387,6 +443,8 @@
std::vector<bbox_t> result_vec = detector.detect(mat_img);
result_vec = detector.tracking_id(result_vec); // comment it - if track_id is not required
draw_boxes(mat_img, result_vec, obj_names);
+ cv::imshow("window name", mat_img);
+ cv::waitKey(3); // 3 or 16ms
show_console_result(result_vec, obj_names);
}
#else
--
Gitblit v1.10.0