From 84d6533cb8112f23a34d3de76435a10f4620f4b8 Mon Sep 17 00:00:00 2001
From: AlexeyAB <alexeyab84@gmail.com>
Date: Mon, 23 Oct 2017 13:43:03 +0000
Subject: [PATCH] Fixed OpenCV usage in the yolo_console_dll.cpp
---
src/yolo_console_dll.cpp | 30 ++++++++++++++++++++----------
1 files changed, 20 insertions(+), 10 deletions(-)
diff --git a/src/yolo_console_dll.cpp b/src/yolo_console_dll.cpp
index de78777..58b3893 100644
--- a/src/yolo_console_dll.cpp
+++ b/src/yolo_console_dll.cpp
@@ -8,7 +8,9 @@
#include <mutex> // std::mutex, std::unique_lock
#include <condition_variable> // std::condition_variable
+#ifdef _WIN32
#define OPENCV
+#endif
#include "yolo_v2_class.hpp" // imported functions from DLL
@@ -28,8 +30,13 @@
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) {
- cv::Scalar color(60, 160, 260);
+ 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::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];
@@ -65,7 +72,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;
}
@@ -93,9 +100,10 @@
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 cap_frame, cur_frame, det_frame, write_frame;
+ 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::atomic<bool> consumed, videowrite_ready;
@@ -110,9 +118,11 @@
std::condition_variable cv;
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);
+ cv::Size const frame_size = cur_frame.size();
cv::VideoWriter output_video;
if (save_output_videofile)
- output_video.open(out_videofile, CV_FOURCC('D', 'I', 'V', 'X'), cap.get(CV_CAP_PROP_FPS), cur_frame.size(), true);
+ output_video.open(out_videofile, CV_FOURCC('D', 'I', 'V', 'X'), std::max(35, video_fps), frame_size, true);
while (!cur_frame.empty()) {
if (t_cap.joinable()) {
@@ -126,7 +136,7 @@
if(consumed)
{
std::unique_lock<std::mutex> lock(mtx);
- cur_frame.copyTo(det_frame);
+ 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;
@@ -134,14 +144,14 @@
// launch thread once
if (!t_detect.joinable()) {
t_detect = std::thread([&]() {
- cv::Mat current_mat = det_frame.clone();
+ auto current_image = det_image;
consumed = true;
- while (!current_mat.empty()) {
- auto result = detector.detect(current_mat, 0.24, true);
+ while (current_image.use_count() > 0) {
+ auto result = detector.detect_resized(*current_image, frame_size, 0.24, true);
++fps_det_counter;
std::unique_lock<std::mutex> lock(mtx);
thread_result_vec = result;
- current_mat = det_frame.clone();
+ current_image = det_image;
consumed = true;
cv.notify_all();
}
@@ -208,7 +218,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