From c6ccb80f17fc3fbdf51fc75650c52686ea97e618 Mon Sep 17 00:00:00 2001
From: AlexeyAB <alexeyab84@gmail.com>
Date: Mon, 11 Sep 2017 18:21:59 +0000
Subject: [PATCH] Fixed yolo_console_dll.cpp
---
src/yolo_console_dll.cpp | 128 ++++++++++++++++++++++++++++++++++++------
1 files changed, 109 insertions(+), 19 deletions(-)
diff --git a/src/yolo_console_dll.cpp b/src/yolo_console_dll.cpp
index 4938ba8..7475ef4 100644
--- a/src/yolo_console_dll.cpp
+++ b/src/yolo_console_dll.cpp
@@ -1,33 +1,59 @@
#include <iostream>
+#include <iomanip>
#include <string>
#include <vector>
#include <fstream>
+#include <thread>
+#include <atomic>
-//#define OPENCV
+#define OPENCV
#include "yolo_v2_class.hpp" // imported functions from DLL
-
#ifdef OPENCV
#include <opencv2/opencv.hpp> // C++
-#pragma comment(lib, "opencv_core249.lib")
-#pragma comment(lib, "opencv_imgproc249.lib")
-#pragma comment(lib, "opencv_highgui249.lib")
-void draw_boxes(cv::Mat mat_img, std::vector<bbox_t> result_vec) {
+#include "opencv2/core/version.hpp"
+#ifndef CV_VERSION_EPOCH
+#include "opencv2/videoio/videoio.hpp"
+#pragma comment(lib, "opencv_world320.lib")
+#else
+#pragma comment(lib, "opencv_core2413.lib")
+#pragma comment(lib, "opencv_imgproc2413.lib")
+#pragma comment(lib, "opencv_highgui2413.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)
+{
for (auto &i : result_vec) {
- cv::rectangle(mat_img, cv::Rect(i.x, i.y, i.w, i.h), cv::Scalar(50, 200, 50), 3);
+ cv::Scalar color(60, 160, 260);
+ 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);
+ }
}
+ 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(0);
+ cv::waitKey(wait_msec);
}
#endif // OPENCV
+
void show_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
+ std::cout << "obj_id = " << i.obj_id << ", x = " << i.x << ", y = " << i.y
<< ", w = " << i.w << ", h = " << i.h
- << ", prob = " << i.prob << std::endl;
+ << std::setprecision(3) << ", prob = " << i.prob << std::endl;
}
}
@@ -41,35 +67,99 @@
}
-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");
+ std::string out_videofile = "result.avi";
+ bool const save_output_videofile = false;
while (true)
- {
- std::string filename;
- std::cout << "input image filename: ";
- std::cin >> filename;
+ {
+ std::cout << "input image or video filename: ";
+ if(filename.size() == 0) std::cin >> filename;
if (filename.size() == 0) break;
try {
#ifdef OPENCV
- cv::Mat mat_img = cv::imread(filename);
- std::vector<bbox_t> result_vec = detector.detect(mat_img);
- draw_boxes(mat_img, result_vec);
+ 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
+ {
+ 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
+ std::thread td([]() {});
+ std::atomic<int> ready_flag;
+ ready_flag = true;
+ std::chrono::steady_clock::time_point steady_start, steady_end;
+ int fps_counter = 0, current_fps = 0;
+ 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 (!prev_frame.empty()) {
+ steady_end = std::chrono::steady_clock::now();
+ if (std::chrono::duration<double>(steady_end - steady_start).count() >= 1) {
+ current_fps = fps_counter;
+ steady_start = steady_end;
+ fps_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;
+ }
+ prev_frame = frame.clone();
+ }
+ }
+ 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);
+ }
#else
//std::vector<bbox_t> result_vec = detector.detect(filename);
auto img = detector.load_image(filename);
std::vector<bbox_t> result_vec = detector.detect(img);
detector.free_image(img);
-#endif
show_result(result_vec, obj_names);
+#endif
}
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