From 9449156e6d95a672ba3c08f9d7d71bbb75f1a311 Mon Sep 17 00:00:00 2001
From: Alexey <AlexeyAB@users.noreply.github.com>
Date: Wed, 17 Jan 2018 23:12:31 +0000
Subject: [PATCH] Added test-compile with: LIBSO=1 GPU=0 CUDNN=0 OPENCV=0 -j 8
---
src/yolo_console_dll.cpp | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/yolo_console_dll.cpp b/src/yolo_console_dll.cpp
index 5acca7c..a9ce6b9 100644
--- a/src/yolo_console_dll.cpp
+++ b/src/yolo_console_dll.cpp
@@ -194,7 +194,7 @@
auto current_image = det_image;
consumed = true;
while (current_image.use_count() > 0) {
- auto result = detector.detect_resized(*current_image, frame_size, 0.24, false); // true
+ auto result = detector.detect_resized(*current_image, frame_size, 0.20, false); // true
++fps_det_counter;
std::unique_lock<std::mutex> lock(mtx);
thread_result_vec = result;
@@ -236,11 +236,13 @@
}
}
+#ifndef TRACK_OPTFLOW
// wait detection result for video-file only (not for net-cam)
- //if (protocol != "rtsp://" && protocol != "http://" && protocol != "https:/") {
- // std::unique_lock<std::mutex> lock(mtx);
- // while (!consumed) cv_detected.wait(lock);
- //}
+ if (protocol != "rtsp://" && protocol != "http://" && protocol != "https:/") {
+ std::unique_lock<std::mutex> lock(mtx);
+ while (!consumed) cv_detected.wait(lock);
+ }
+#endif
}
if (t_cap.joinable()) t_cap.join();
if (t_detect.joinable()) t_detect.join();
--
Gitblit v1.10.0