From 9f08028f23d9e5cbfa159bec1e07d63b141a6809 Mon Sep 17 00:00:00 2001
From: zhangjixing <775834166@qq.com>
Date: 星期五, 18 一月 2019 10:17:00 +0800
Subject: [PATCH]
---
QiaoJiaSystem/StructureApp/AppPipeController.cpp | 37 +++++++++++++++++++++++--------------
1 files changed, 23 insertions(+), 14 deletions(-)
diff --git a/QiaoJiaSystem/StructureApp/AppPipeController.cpp b/QiaoJiaSystem/StructureApp/AppPipeController.cpp
index db11a0c..457c8db 100644
--- a/QiaoJiaSystem/StructureApp/AppPipeController.cpp
+++ b/QiaoJiaSystem/StructureApp/AppPipeController.cpp
@@ -192,12 +192,12 @@
// int max=appPref.getIntData("n_cut_max_duration");
// recordInit(40,100);
videoCaptureElement.registerConnector([&] {
-
+ mutex.lock();
cv::Mat imageTemp = videoCaptureElement.getImage();
- std::string strNewTime;
- strNewTime = AppUtil::getTimeUSecString();
-
+ std::string strNewTime = AppUtil::getTimeUSecString();;
+ mutex.unlock();
+//DBG("m_camId="<<m_camId<<" strNewTime="<<strNewTime);
// cv::putText(imageTemp, strNewTime, cv::Point(408, 540), cv::HersheyFonts::FONT_HERSHEY_PLAIN, 5,
// cv::Scalar(255, 255, 0), 2);
if (m_camId.size() > 0) {
@@ -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,7 +214,6 @@
perHubElement.getTriggerState() ||
perStaticElement.getTriggerState()
);
-
}
@@ -254,9 +253,9 @@
imageDrawElement.submit();
}
- if (bRecordVideoEnable) {
- registerElement(triggerElement);
- }
+// if (bRecordVideoEnable) {
+// registerElement(triggerElement);
+// }
});
@@ -303,7 +302,7 @@
registerElement(faceExtractElement);
}
registerElement(imageDrawElement);
- registerElement(newRecordVideoElement);
+ // registerElement(newRecordVideoElement);
videoCaptureElement.setOutPutInterval(3);
faceExtractElement.setProperty("index", to_string(m_index));
registerElement(yoloRpcElement);
@@ -437,10 +436,20 @@
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());
+ leftJudgment.submit();
+ }
+ if(!rightJudgment.isBusy())
+ {
+ rightJudgment.setYoloObjects(yoloRpcElement.getLastScoreRects());
+
+ rightJudgment.setImage(yoloRpcElement.getImage());
+ rightJudgment.submit();
+ }
+
});
registerElement(leftJudgment);
registerElement(rightJudgment);
--
Gitblit v1.8.0