From abd9036f024a77d22b47a108bc88b27b9732e3c5 Mon Sep 17 00:00:00 2001
From: zhangjixing <775834166@qq.com>
Date: 星期二, 15 一月 2019 17:27:27 +0800
Subject: [PATCH]
---
QiaoJiaSystem/StructureApp/AppPipeController.cpp | 35 ++++++++++++++++++++---------------
1 files changed, 20 insertions(+), 15 deletions(-)
diff --git a/QiaoJiaSystem/StructureApp/AppPipeController.cpp b/QiaoJiaSystem/StructureApp/AppPipeController.cpp
index 6edd112..321f170 100644
--- a/QiaoJiaSystem/StructureApp/AppPipeController.cpp
+++ b/QiaoJiaSystem/StructureApp/AppPipeController.cpp
@@ -192,7 +192,7 @@
// int max=appPref.getIntData("n_cut_max_duration");
// recordInit(40,100);
videoCaptureElement.registerConnector([&] {
-
+ mutex.lock();
cv::Mat imageTemp = videoCaptureElement.getImage();
std::string strNewTime;
@@ -206,7 +206,7 @@
if (bRecordVideoEnable) {
newRecordVideoElement.pushImgBuf(strNewTime, imageTemp);
newRecordVideoElement.setSdkTrigger(faceRpcElement.getTriggerState() ||//TODO
- personElement.getTrigger() ||
+ personElement.getTriggerState() ||
leftJudgment.getTriggerState() ||
rightJudgment.getTriggerState() ||
perimeterElement.getTriggerState() ||
@@ -214,9 +214,6 @@
perHubElement.getTriggerState() ||
perStaticElement.getTriggerState()
);
- if (!newRecordVideoElement.isBusy()) {
- newRecordVideoElement.submit();
- }
}
@@ -255,10 +252,10 @@
imageDrawElement.setImage(imageTemp);
imageDrawElement.submit();
}
-
- if (bRecordVideoEnable) {
- registerElement(triggerElement);
- }
+ mutex.unlock();
+// if (bRecordVideoEnable) {
+// registerElement(triggerElement);
+// }
});
@@ -305,8 +302,8 @@
registerElement(faceExtractElement);
}
registerElement(imageDrawElement);
- registerElement(newRecordVideoElement);
- videoCaptureElement.setOutPutInterval(5);
+ // registerElement(newRecordVideoElement);
+ videoCaptureElement.setOutPutInterval(3);
faceExtractElement.setProperty("index", to_string(m_index));
registerElement(yoloRpcElement);
//#todo setProperty
@@ -439,10 +436,18 @@
leftJudgment.init(rule.strAreas, rule.strLine);
rightJudgment.init(rule.strExAreas, rule.strExLine);
yoloRpcElement.registerConnector([&] {
- leftJudgment.setYoloObjects(yoloRpcElement.getLastScoreRects());
- rightJudgment.setYoloObjects(yoloRpcElement.getLastScoreRects());
- leftJudgment.setImage(yoloRpcElement.getImage());
- rightJudgment.setImage(yoloRpcElement.getImage());
+ if(!leftJudgment.isBusy())
+ {
+ leftJudgment.setYoloObjects(yoloRpcElement.getLastScoreRects());
+ leftJudgment.setImage(yoloRpcElement.getImage());
+ }
+ if(!rightJudgment.isBusy())
+ {
+ rightJudgment.setYoloObjects(yoloRpcElement.getLastScoreRects());
+
+ rightJudgment.setImage(yoloRpcElement.getImage());
+ }
+
});
registerElement(leftJudgment);
registerElement(rightJudgment);
--
Gitblit v1.8.0