From 08d6910521d9aa05a11d0db154ae70874e47d0e1 Mon Sep 17 00:00:00 2001
From: Alexey <AlexeyAB@users.noreply.github.com>
Date: Wed, 09 Aug 2017 21:06:24 +0000
Subject: [PATCH] Update Readme.md
---
src/yolo_console_dll.cpp | 29 ++++++++++++++++++-----------
1 files changed, 18 insertions(+), 11 deletions(-)
diff --git a/src/yolo_console_dll.cpp b/src/yolo_console_dll.cpp
index 52c59df..e1f2c7e 100644
--- a/src/yolo_console_dll.cpp
+++ b/src/yolo_console_dll.cpp
@@ -31,9 +31,10 @@
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);
- size_t const max_width = (text_size.width > i.w + 2) ? text_size.width : (i.w + 2);
- if(i.x > 3 && (i.x + max_width) < mat_img.cols && i.y > 30 && i.y < mat_img.rows)
- cv::rectangle(mat_img, cv::Point2f(i.x - 3, i.y - 30), cv::Point2f(i.x + max_width, i.y), color, CV_FILLED, 8, 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);
}
}
@@ -62,35 +63,40 @@
}
-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);
std::string const protocol = filename.substr(0, 4);
- if (file_ext == "avi" || file_ext == "mp4" || file_ext == "mjpg" || file_ext == "mov" || protocol == "rtsp") { // video file
+ 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
std::thread td([]() {});
- std::atomic<int> ready_flag = false;
+ 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.2, true); ready_flag = true; });
+ td = std::thread([&]() { thread_result_vec = detector.detect(det_frame, 0.24, true); ready_flag = true; });
if (!prev_frame.empty()) {
result_vec = detector.tracking(result_vec); // comment it - if track_id is not required
@@ -98,7 +104,7 @@
show_result(result_vec, obj_names);
}
prev_frame = frame;
- //if(protocol == "rtsp") while (!ready_flag) cap.grab(); // use if cam-fps 2x or more than dnn-fps
+ //if (protocol == "rtsp" || protocol == "http") do { cap.grab(); } while (!ready_flag); // use if cam-fps 2x or more than dnn-fps
ready_flag = false;
}
}
@@ -134,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