From cd8a3dcb4ca42f22ad8f46a95e00977c92be6bbd Mon Sep 17 00:00:00 2001
From: AlexeyAB <alexeyab84@gmail.com>
Date: Thu, 08 Feb 2018 23:22:42 +0000
Subject: [PATCH] Compile fixes
---
src/yolo_console_dll.cpp | 248 ++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 201 insertions(+), 47 deletions(-)
diff --git a/src/yolo_console_dll.cpp b/src/yolo_console_dll.cpp
index 7475ef4..686ea33 100644
--- a/src/yolo_console_dll.cpp
+++ b/src/yolo_console_dll.cpp
@@ -2,11 +2,19 @@
#include <iomanip>
#include <string>
#include <vector>
+#include <queue>
#include <fstream>
#include <thread>
#include <atomic>
+#include <mutex> // std::mutex, std::unique_lock
+#include <condition_variable> // std::condition_variable
+#ifdef _WIN32
#define OPENCV
+#endif
+
+// 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
@@ -15,40 +23,48 @@
#include "opencv2/core/version.hpp"
#ifndef CV_VERSION_EPOCH
#include "opencv2/videoio/videoio.hpp"
-#pragma comment(lib, "opencv_world320.lib")
+#define OPENCV_VERSION CVAUX_STR(CV_VERSION_MAJOR)""CVAUX_STR(CV_VERSION_MINOR)""CVAUX_STR(CV_VERSION_REVISION)
+#pragma comment(lib, "opencv_world" OPENCV_VERSION ".lib")
+#pragma comment(lib, "opencv_cudaoptflow" OPENCV_VERSION ".lib")
+#pragma comment(lib, "opencv_cudaimgproc" OPENCV_VERSION ".lib")
+#pragma comment(lib, "opencv_core" OPENCV_VERSION ".lib")
+#pragma comment(lib, "opencv_imgproc" OPENCV_VERSION ".lib")
+#pragma comment(lib, "opencv_highgui" OPENCV_VERSION ".lib")
#else
-#pragma comment(lib, "opencv_core2413.lib")
-#pragma comment(lib, "opencv_imgproc2413.lib")
-#pragma comment(lib, "opencv_highgui2413.lib")
+#define OPENCV_VERSION CVAUX_STR(CV_VERSION_EPOCH)""CVAUX_STR(CV_VERSION_MAJOR)""CVAUX_STR(CV_VERSION_MINOR)
+#pragma comment(lib, "opencv_core" OPENCV_VERSION ".lib")
+#pragma comment(lib, "opencv_imgproc" OPENCV_VERSION ".lib")
+#pragma comment(lib, "opencv_highgui" OPENCV_VERSION ".lib")
#endif
-
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_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 } };
+
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, 5);
+ 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, 2);
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::rectangle(mat_img, cv::Point2f(std::max((int)i.x - 1, 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);
}
}
- if(current_fps >= 0)
- putText(mat_img, "FPS: " + std::to_string(current_fps), 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);
+ if (current_det_fps >= 0 && current_cap_fps >= 0) {
+ 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);
+ }
}
#endif // OPENCV
-void show_result(std::vector<bbox_t> const result_vec, std::vector<std::string> const obj_names) {
+void show_console_result(std::vector<bbox_t> const result_vec, std::vector<std::string> const obj_names) {
for (auto &i : result_vec) {
if (obj_names.size() > i.obj_id) std::cout << obj_names[i.obj_id] << " - ";
std::cout << "obj_id = " << i.obj_id << ", x = " << i.x << ", y = " << i.y
@@ -61,7 +77,7 @@
std::ifstream file(filename);
std::vector<std::string> file_lines;
if (!file.is_open()) return file_lines;
- for(std::string line; file >> line;) file_lines.push_back(line);
+ for(std::string line; getline(file, line);) file_lines.push_back(line);
std::cout << "object names loaded \n";
return file_lines;
}
@@ -69,14 +85,30 @@
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("yolo-voc.cfg", "yolo-voc.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");
+ 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);
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)
{
@@ -86,46 +118,166 @@
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
- protocol == "rtsp://" || protocol == "http://" || protocol == "https:/") // video network stream
+ protocol == "rtmp://" || protocol == "rtsp://" || protocol == "http://" || protocol == "https:/") // video network stream
{
- cv::Mat frame, prev_frame, det_frame;
+ cv::Mat cap_frame, cur_frame, det_frame, write_frame;
+ std::queue<cv::Mat> track_optflow_queue;
+ int passed_flow_frames = 0;
+ std::shared_ptr<image_t> det_image;
std::vector<bbox_t> result_vec, thread_result_vec;
detector.nms = 0.02; // comment it - if track_id is not required
- std::thread td([]() {});
- std::atomic<int> ready_flag;
- ready_flag = true;
+ std::atomic<bool> consumed, videowrite_ready;
+ consumed = true;
+ videowrite_ready = true;
+ std::atomic<int> fps_det_counter, fps_cap_counter;
+ fps_det_counter = 0;
+ fps_cap_counter = 0;
+ int current_det_fps = 0, current_cap_fps = 0;
+ std::thread t_detect, t_cap, t_videowrite;
+ std::mutex mtx;
+ std::condition_variable cv_detected, cv_pre_tracked;
std::chrono::steady_clock::time_point steady_start, steady_end;
- int fps_counter = 0, current_fps = 0;
+ cv::VideoCapture cap(filename); cap >> cur_frame;
+ int const video_fps = cap.get(CV_CAP_PROP_FPS);
+ cv::Size const frame_size = cur_frame.size();
cv::VideoWriter output_video;
- for (cv::VideoCapture cap(filename); cap >> frame, cap.isOpened();) {
- if(!output_video.isOpened() && save_output_videofile)
- output_video.open(out_videofile, CV_FOURCC('D','I','V','X'), cap.get(CV_CAP_PROP_FPS), frame.size(), true);
- if (ready_flag || (protocol != "rtsp://" && protocol != "http://" && protocol != "https:/")) {
- td.join();
- ++fps_counter;
- ready_flag = false;
- result_vec = thread_result_vec;
- result_vec = detector.tracking(result_vec); // comment it - if track_id is not required
- det_frame = frame.clone();
- td = std::thread([&]() { thread_result_vec = detector.detect(det_frame, 0.24, true); ready_flag = true; });
+ if (save_output_videofile)
+ output_video.open(out_videofile, CV_FOURCC('D', 'I', 'V', 'X'), std::max(35, video_fps), frame_size, true);
+
+ while (!cur_frame.empty())
+ {
+ // always sync
+ if (t_cap.joinable()) {
+ t_cap.join();
+ ++fps_cap_counter;
+ cur_frame = cap_frame.clone();
}
- if (!prev_frame.empty()) {
+ t_cap = std::thread([&]() { cap >> cap_frame; });
+
+ // 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);
+ 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) {
+ //std::cout << "\n !!!! all = " << track_optflow_queue.size() << ", cur = " << passed_flow_frames << std::endl;
+ 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(), false);
+ }
+ 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(),
+ [&i](bbox_t const& b) { return b.track_id == i.track_id && b.obj_id == i.obj_id; });
+ bool track_id_absent = (it == result_vec.end());
+ if (track_id_absent) {
+ if (i.frames_counter-- > 1)
+ result_vec.push_back(i);
+ }
+ 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();
+ }
+ // launch thread once - Detection
+ if (!t_detect.joinable()) {
+ t_detect = std::thread([&]() {
+ auto current_image = det_image;
+ consumed = true;
+ while (current_image.use_count() > 0) {
+ 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;
+ consumed = true;
+ cv_detected.notify_all();
+ 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();
if (std::chrono::duration<double>(steady_end - steady_start).count() >= 1) {
- current_fps = fps_counter;
+ current_det_fps = fps_det_counter;
+ current_cap_fps = fps_cap_counter;
steady_start = steady_end;
- fps_counter = 0;
+ fps_det_counter = 0;
+ fps_cap_counter = 0;
}
- draw_boxes(prev_frame, result_vec, obj_names, 3, current_fps);
- show_result(result_vec, obj_names);
- if (output_video.isOpened())
- output_video << prev_frame;
+
+ 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); // track optical flow
+ small_preview.draw(cur_frame, show_small_boxes);
+#endif
+
+ 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();
+ write_frame = cur_frame.clone();
+ videowrite_ready = false;
+ t_videowrite = std::thread([&]() {
+ output_video << write_frame; videowrite_ready = true;
+ });
+ }
}
- prev_frame = frame.clone();
+
+#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_detected.wait(lock);
+ }
+#endif
}
+ if (t_cap.joinable()) t_cap.join();
+ if (t_detect.joinable()) t_detect.join();
+ if (t_videowrite.joinable()) t_videowrite.join();
+ std::cout << "Video ended \n";
}
else if (file_ext == "txt") { // list of image files
std::ifstream file(filename);
@@ -135,7 +287,7 @@
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);
+ show_console_result(result_vec, obj_names);
//draw_boxes(mat_img, result_vec, obj_names);
//cv::imwrite("res_" + line, mat_img);
}
@@ -144,9 +296,11 @@
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
+ result_vec = detector.tracking_id(result_vec); // comment it - if track_id is not required
draw_boxes(mat_img, result_vec, obj_names);
- show_result(result_vec, obj_names);
+ cv::imshow("window name", mat_img);
+ cv::waitKey(3); // 3 or 16ms
+ show_console_result(result_vec, obj_names);
}
#else
//std::vector<bbox_t> result_vec = detector.detect(filename);
@@ -154,7 +308,7 @@
auto img = detector.load_image(filename);
std::vector<bbox_t> result_vec = detector.detect(img);
detector.free_image(img);
- show_result(result_vec, obj_names);
+ show_console_result(result_vec, obj_names);
#endif
}
catch (std::exception &e) { std::cerr << "exception: " << e.what() << "\n"; getchar(); }
--
Gitblit v1.10.0