From de04ae1cab83fb73dff595e5949a2edbafde9307 Mon Sep 17 00:00:00 2001 From: Francesco Gatti Date: Tue, 19 Feb 2019 09:03:33 +0000 Subject: [PATCH] doc --- README.md | 4 ++-- demo/demo/demo.cpp | 17 +++++++++++------ 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index ae0d203..1201cfb 100644 --- a/README.md +++ b/README.md @@ -44,8 +44,8 @@ rm yolo3_berkeley.rt # be sure to delete(or move) old tensorRT files ``` this will genereate a yolo3_berkeley.rt file that can be used for live detection: ``` -./demo # launch detection on a demo video -./demo /dev/video0 # launch detection on device 0 +./yolo3_demo # launch detection on a demo video +./yolo3_demo yolo3_berkeley.rt /dev/video0 # launch detection on device 0 ``` diff --git a/demo/demo/demo.cpp b/demo/demo/demo.cpp index fbdb2ff..2200005 100644 --- a/demo/demo/demo.cpp +++ b/demo/demo/demo.cpp @@ -23,15 +23,19 @@ int main(int argc, char *argv[]) { std::cout<<"detection\n"; signal(SIGINT, sig_handler); + + char *net = "yolo3_berkeley.rt"; + if(argc > 1) + net = argv[1]; + char *input = "../demo/yolo_test.mp4"; + if(argc > 2) + input = argv[1]; + tk::dnn::Yolo3Detection yolo; - yolo.init("yolo3_berkeley.rt"); + yolo.init(net); gRun = true; - char *input = "../demo/yolo_test.mp4"; - if(argc > 1) - input = argv[1]; - cv::VideoCapture cap(input); if(!cap.isOpened()) gRun = false; @@ -41,7 +45,6 @@ int main(int argc, char *argv[]) { cv::Mat frame; cv::Mat dnn_input; cv::namedWindow("detection", cv::WINDOW_NORMAL); - cv::resizeWindow("detection", 544*1.2, 320*1.2); while(gRun) { cap >> frame; @@ -49,7 +52,9 @@ int main(int argc, char *argv[]) { continue; } + // this will be resized to the net format dnn_input = frame.clone(); + // TODO: async infer yolo.update(dnn_input); // draw dets