From 0436e5443295395025f89f0d091aab1e9551d1a4 Mon Sep 17 00:00:00 2001
From: pansen <pansen626@sina.com>
Date: 星期四, 10 一月 2019 20:26:31 +0800
Subject: [PATCH] Merge branch 'ywv1.2' of ssh://192.168.1.226:29418/development/c++ into ywv1.2
---
QiaoJiaSystem/build/FaceDetectResourcesTest | 0
QiaoJiaSystem/build/RapidStructureApp | 0
QiaoJiaSystem/YoloServer/YoloDetectServerI.cpp | 3 +++
QiaoJiaSystem/build/TestCilent | 0
QiaoJiaSystem/build/RecordVideo | 0
QiaoJiaSystem/build/config.db | 0
QiaoJiaSystem/build/RapidStructureAppRtsp | 0
7 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/QiaoJiaSystem/YoloServer/YoloDetectServerI.cpp b/QiaoJiaSystem/YoloServer/YoloDetectServerI.cpp
index cb0e612..a806136 100644
--- a/QiaoJiaSystem/YoloServer/YoloDetectServerI.cpp
+++ b/QiaoJiaSystem/YoloServer/YoloDetectServerI.cpp
@@ -35,6 +35,9 @@
//printf("Predicted in %f seconds.\n", what_time_is_it_now()-attime);
int nboxes = 0;
detection *dets = get_network_boxes(m_net, im.w, im.h, m_thresh, m_hier_thresh, 0, 1, &nboxes);
+ if (nboxes > 30) {
+ return objInfos;
+ }
if (m_nms) do_nms_sort(dets, nboxes, l.classes, m_nms);
// draw_detections(im, dets, nboxes, m_thresh, names, alphabet, l.classes);
for (int i = 0; i < nboxes; i++) {
diff --git a/QiaoJiaSystem/build/FaceDetectResourcesTest b/QiaoJiaSystem/build/FaceDetectResourcesTest
index 818b439..23a18af 100755
--- a/QiaoJiaSystem/build/FaceDetectResourcesTest
+++ b/QiaoJiaSystem/build/FaceDetectResourcesTest
Binary files differ
diff --git a/QiaoJiaSystem/build/RapidStructureApp b/QiaoJiaSystem/build/RapidStructureApp
index 80f4a38..91efcf5 100755
--- a/QiaoJiaSystem/build/RapidStructureApp
+++ b/QiaoJiaSystem/build/RapidStructureApp
Binary files differ
diff --git a/QiaoJiaSystem/build/RapidStructureAppRtsp b/QiaoJiaSystem/build/RapidStructureAppRtsp
index d0757cf..0a22fa1 100755
--- a/QiaoJiaSystem/build/RapidStructureAppRtsp
+++ b/QiaoJiaSystem/build/RapidStructureAppRtsp
Binary files differ
diff --git a/QiaoJiaSystem/build/RecordVideo b/QiaoJiaSystem/build/RecordVideo
index a5fa727..e4c0679 100755
--- a/QiaoJiaSystem/build/RecordVideo
+++ b/QiaoJiaSystem/build/RecordVideo
Binary files differ
diff --git a/QiaoJiaSystem/build/TestCilent b/QiaoJiaSystem/build/TestCilent
index 88b4210..fdebc81 100755
--- a/QiaoJiaSystem/build/TestCilent
+++ b/QiaoJiaSystem/build/TestCilent
Binary files differ
diff --git a/QiaoJiaSystem/build/config.db b/QiaoJiaSystem/build/config.db
index 26c9a27..a1cb01d 100644
--- a/QiaoJiaSystem/build/config.db
+++ b/QiaoJiaSystem/build/config.db
Binary files differ
--
Gitblit v1.8.0