From ea09a6e0b38e1ddf43ffcd81d27f0506411eb8e4 Mon Sep 17 00:00:00 2001
From: AlexeyAB <alexeyab84@gmail.com>
Date: Tue, 09 Jan 2018 19:26:54 +0000
Subject: [PATCH] Command line for example of usage DLL/SO
---
src/yolo_console_dll.cpp | 31 +++++++++++++++++++------------
1 files changed, 19 insertions(+), 12 deletions(-)
diff --git a/src/yolo_console_dll.cpp b/src/yolo_console_dll.cpp
index abf4bdc..dd922ec 100644
--- a/src/yolo_console_dll.cpp
+++ b/src/yolo_console_dll.cpp
@@ -11,10 +11,9 @@
#ifdef _WIN32
#define OPENCV
-#include "windows.h"
#endif
-#define TRACK_OPTFLOW
+//#define TRACK_OPTFLOW
#include "yolo_v2_class.hpp" // imported functions from DLL
@@ -91,17 +90,27 @@
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("cfg/yolo-voc.cfg", "yolo-voc.weights");
- Detector detector("tiny-yolo-voc_air.cfg", "backup/tiny-yolo-voc_air_5000.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");
+ 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;
+ bool const save_output_videofile = true;
#ifdef TRACK_OPTFLOW
Tracker_optflow tracker_flow;
+ detector.wait_stream = true;
#endif
while (true)
@@ -185,17 +194,15 @@
auto current_image = det_image;
consumed = true;
while (current_image.use_count() > 0) {
- //std::vector<bbox_t> result;
auto result = detector.detect_resized(*current_image, frame_size, 0.24, false); // true
- //Sleep(200);
- //Sleep(50);
++fps_det_counter;
std::unique_lock<std::mutex> lock(mtx);
thread_result_vec = result;
current_image = det_image;
consumed = true;
cv_detected.notify_all();
- while (consumed) cv_pre_tracked.wait(lock);
+ if(detector.wait_stream)
+ while (consumed) cv_pre_tracked.wait(lock);
}
});
}
@@ -216,7 +223,7 @@
result_vec = tracker_flow.tracking_flow(cur_frame, result_vec); // track optical flow
#endif
- draw_boxes(cur_frame, result_vec, obj_names, 3, current_det_fps, current_cap_fps);
+ draw_boxes(cur_frame, result_vec, obj_names, 3, current_det_fps, current_cap_fps); // 3 or 16ms
//show_console_result(result_vec, obj_names);
if (output_video.isOpened() && videowrite_ready) {
--
Gitblit v1.10.0