From 8d41842cf2206011733aade804f363db4da5ff63 Mon Sep 17 00:00:00 2001 From: AlexeyAB Date: Mon, 11 Sep 2017 19:04:08 +0300 Subject: [PATCH] Show FPS and store result.avi video output in yolo_console_dll.cpp --- src/image.c | 4 ++++ src/yolo_console_dll.cpp | 28 ++++++++++++++++++++++++---- 2 files changed, 28 insertions(+), 4 deletions(-) diff --git a/src/image.c b/src/image.c index 3375ea2b..d44bb776 100644 --- a/src/image.c +++ b/src/image.c @@ -543,6 +543,10 @@ void show_image_cv_ipl(IplImage *disp, const char *name, const char *out_filenam //output_video = cvCreateVideoWriter(out_filename, CV_FOURCC('H', '2', '6', '4'), 25, size, 1); output_video = cvCreateVideoWriter(out_filename, CV_FOURCC('D', 'I', 'V', 'X'), 25, size, 1); //output_video = cvCreateVideoWriter(out_filename, CV_FOURCC('M', 'J', 'P', 'G'), 25, size, 1); + //output_video = cvCreateVideoWriter(out_filename, CV_FOURCC('M', 'P', '4', 'V'), 25, size, 1); + //output_video = cvCreateVideoWriter(out_filename, CV_FOURCC('M', 'P', '4', '2'), 25, size, 1); + //output_video = cvCreateVideoWriter(out_filename, CV_FOURCC('X', 'V', 'I', 'D'), 25, size, 1); + //output_video = cvCreateVideoWriter(out_filename, CV_FOURCC('W', 'M', 'V', '2'), 25, size, 1); } cvWriteFrame(output_video, disp); // comment this line to improve FPS !!! diff --git a/src/yolo_console_dll.cpp b/src/yolo_console_dll.cpp index 3560a28d..c2cf1ddd 100644 --- a/src/yolo_console_dll.cpp +++ b/src/yolo_console_dll.cpp @@ -23,7 +23,9 @@ #endif -void draw_boxes(cv::Mat mat_img, std::vector result_vec, std::vector obj_names, unsigned int wait_msec = 0) { +void draw_boxes(cv::Mat mat_img, std::vector result_vec, std::vector obj_names, + unsigned int wait_msec = 0, int current_fps = -1) +{ 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); @@ -38,6 +40,8 @@ void draw_boxes(cv::Mat mat_img, std::vector result_vec, std::vector= 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); } @@ -71,6 +75,8 @@ int main(int argc, char *argv[]) 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) { @@ -91,20 +97,34 @@ int main(int argc, char *argv[]) std::thread td([]() {}); std::atomic 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; td = std::thread([&]() { thread_result_vec = detector.detect(det_frame, 0.24, true); ready_flag = true; }); } - if (!prev_frame.empty()) { - draw_boxes(prev_frame, result_vec, obj_names, 3); + if (!prev_frame.empty()) { + steady_end = std::chrono::steady_clock::now(); + if (std::chrono::duration(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; + prev_frame = frame; } } else if (file_ext == "txt") { // list of image files