From f4a30ef60a3c9288967386d3b023fa3cf7ffb465 Mon Sep 17 00:00:00 2001
From: AlexeyAB <alexeyab84@gmail.com>
Date: Tue, 08 Aug 2017 19:16:28 +0000
Subject: [PATCH] Track id fixed
---
src/yolo_console_dll.cpp | 73 ++++++++++++++++++++++++++++--------
1 files changed, 57 insertions(+), 16 deletions(-)
diff --git a/src/yolo_console_dll.cpp b/src/yolo_console_dll.cpp
index dbdaf85..e1f2c7e 100644
--- a/src/yolo_console_dll.cpp
+++ b/src/yolo_console_dll.cpp
@@ -4,6 +4,7 @@
#include <vector>
#include <fstream>
#include <thread>
+#include <atomic>
#define OPENCV
@@ -25,11 +26,17 @@
void draw_boxes(cv::Mat mat_img, std::vector<bbox_t> result_vec, std::vector<std::string> obj_names, unsigned int wait_msec = 0) {
for (auto &i : result_vec) {
cv::Scalar color(60, 160, 260);
- cv::rectangle(mat_img, cv::Rect(i.x, i.y, i.w, i.h), color, 3);
- if(obj_names.size() > i.obj_id)
- putText(mat_img, obj_names[i.obj_id], cv::Point2f(i.x, i.y - 10), cv::FONT_HERSHEY_COMPLEX_SMALL, 1, color);
- if(i.track_id > 0)
- putText(mat_img, std::to_string(i.track_id), cv::Point2f(i.x+5, i.y + 15), cv::FONT_HERSHEY_COMPLEX_SMALL, 1, color);
+ 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];
+ if (i.track_id > 0) obj_name += " - " + std::to_string(i.track_id);
+ cv::Size const text_size = getTextSize(obj_name, cv::FONT_HERSHEY_COMPLEX_SMALL, 1.2, 2, 0);
+ int const max_width = (text_size.width > i.w + 2) ? text_size.width : (i.w + 2);
+ cv::rectangle(mat_img, cv::Point2f(std::max((int)i.x - 3, 0), std::max((int)i.y - 30, 0)),
+ cv::Point2f(std::min((int)i.x + max_width, mat_img.cols-1), std::min((int)i.y, mat_img.rows-1)),
+ color, CV_FILLED, 8, 0);
+ putText(mat_img, obj_name, cv::Point2f(i.x, i.y - 10), cv::FONT_HERSHEY_COMPLEX_SMALL, 1.2, cv::Scalar(0, 0, 0), 2);
+ }
}
cv::imshow("window name", mat_img);
cv::waitKey(wait_msec);
@@ -56,36 +63,69 @@
}
-int main()
+int main(int argc, char *argv[])
{
+ std::string filename;
+ if (argc > 1) filename = argv[1];
+
Detector detector("yolo-voc.cfg", "yolo-voc.weights");
auto obj_names = objects_names_from_file("data/voc.names");
while (true)
- {
- std::string filename;
+ {
std::cout << "input image or video filename: ";
- std::cin >> filename;
+ if(filename.size() == 0) std::cin >> filename;
if (filename.size() == 0) break;
try {
#ifdef OPENCV
std::string const file_ext = filename.substr(filename.find_last_of(".") + 1);
- if (file_ext == "avi" || file_ext == "mp4" || file_ext == "mjpg" || file_ext == "mov") { // video file
- cv::Mat frame;
+ std::string const protocol = filename.substr(0, 4);
+ if (file_ext == "avi" || file_ext == "mp4" || file_ext == "mjpg" || file_ext == "mov" || // video file
+ protocol == "rtsp" || protocol == "http") // video network stream
+ {
+ cv::Mat frame, prev_frame, det_frame;
+ std::vector<bbox_t> result_vec, thread_result_vec;
detector.nms = 0.02; // comment it - if track_id is not required
- for(cv::VideoCapture cap(filename); cap >> frame, cap.isOpened();) {
- std::vector<bbox_t> result_vec = detector.detect(frame, 0.2);
- result_vec = detector.tracking(result_vec); // comment it - if track_id is not required
+ std::thread td([]() {});
+ std::atomic<int> ready_flag;
+ ready_flag = false;
+ cv::VideoCapture cap(filename);
+ for (; cap >> frame, cap.isOpened();) {
+ td.join();
+ result_vec = thread_result_vec;
+ det_frame = frame;
+ td = std::thread([&]() { thread_result_vec = detector.detect(det_frame, 0.24, true); ready_flag = true; });
- draw_boxes(frame, result_vec, obj_names, 3);
- show_result(result_vec, obj_names);
+ if (!prev_frame.empty()) {
+ result_vec = detector.tracking(result_vec); // comment it - if track_id is not required
+ draw_boxes(prev_frame, result_vec, obj_names, 3);
+ show_result(result_vec, obj_names);
+ }
+ prev_frame = frame;
+ //if (protocol == "rtsp" || protocol == "http") do { cap.grab(); } while (!ready_flag); // use if cam-fps 2x or more than dnn-fps
+ ready_flag = false;
}
}
+ else if (file_ext == "txt") { // list of image files
+ std::ifstream file(filename);
+ if (!file.is_open()) std::cout << "File not found! \n";
+ else
+ for (std::string line; file >> line;) {
+ std::cout << line << std::endl;
+ cv::Mat mat_img = cv::imread(line);
+ std::vector<bbox_t> result_vec = detector.detect(mat_img);
+ show_result(result_vec, obj_names);
+ //draw_boxes(mat_img, result_vec, obj_names);
+ //cv::imwrite("res_" + line, mat_img);
+ }
+
+ }
else { // image file
cv::Mat mat_img = cv::imread(filename);
std::vector<bbox_t> result_vec = detector.detect(mat_img);
+ result_vec = detector.tracking(result_vec); // comment it - if track_id is not required
draw_boxes(mat_img, result_vec, obj_names);
show_result(result_vec, obj_names);
}
@@ -100,6 +140,7 @@
}
catch (std::exception &e) { std::cerr << "exception: " << e.what() << "\n"; getchar(); }
catch (...) { std::cerr << "unknown exception \n"; getchar(); }
+ filename.clear();
}
return 0;
--
Gitblit v1.10.0