From 5a2a5679708c098a9d9d5973bc485f2e3c35c61d Mon Sep 17 00:00:00 2001
From: AlexeyAB <alexeyab84@gmail.com>
Date: Wed, 17 Jan 2018 09:56:51 +0000
Subject: [PATCH] Fixed wait_stream flag, for compilation without GPU
---
src/yolo_console_dll.cpp | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/src/yolo_console_dll.cpp b/src/yolo_console_dll.cpp
index 3f22eb5..5acca7c 100644
--- a/src/yolo_console_dll.cpp
+++ b/src/yolo_console_dll.cpp
@@ -11,9 +11,9 @@
#ifdef _WIN32
#define OPENCV
-//#include "windows.h"
#endif
+// To use tracking - uncomment the following line. Tracking is supported only by OpenCV 3.x
//#define TRACK_OPTFLOW
#include "yolo_v2_class.hpp" // imported functions from DLL
@@ -91,13 +91,22 @@
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;
#ifdef TRACK_OPTFLOW
@@ -173,7 +182,6 @@
new_track_optflow_queue = track_optflow_queue;
}
track_optflow_queue = new_track_optflow_queue;
- new_track_optflow_queue.swap(std::queue<cv::Mat>());
passed_flow_frames = 0;
}
#endif
--
Gitblit v1.10.0