From d3b7bbe7102cd089680a828f5d8f6402c8cf6342 Mon Sep 17 00:00:00 2001
From: pansen <pansen626@sina.com>
Date: 星期四, 07 三月 2019 14:43:28 +0800
Subject: [PATCH] GB28181集成完成,集成推流模块
---
QiaoJiaSystem/StructureApp/YoloRpcElement.cpp | 20 +++++++++-----------
1 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/QiaoJiaSystem/StructureApp/YoloRpcElement.cpp b/QiaoJiaSystem/StructureApp/YoloRpcElement.cpp
index a56a7e7..e3ccd11 100644
--- a/QiaoJiaSystem/StructureApp/YoloRpcElement.cpp
+++ b/QiaoJiaSystem/StructureApp/YoloRpcElement.cpp
@@ -64,7 +64,7 @@
void YoloRpcElement::threadFunc()
{
- // ClockTimer ct("YoloRpcElement::threadFunc");
+ // ClockTimer ct("YoloRpcElement::threadFunc");
triggerScoredRects.clear();
try {
auto server = rpcClient.getServer();
@@ -79,17 +79,13 @@
{
ERR(e.what())
}
- int size=objs.size();
- if(size>30)
- {
+// int size=objs.size();
+// if(size>30)
+// {
-// cv::imshow("image", image);
-
-// cv::waitKey();
-
- DBG("size="<<size);
- return;
- }
+// DBG("size="<<size);
+// return;
+// }
for (auto &obj: objs)
{
@@ -105,11 +101,13 @@
scoredRect.rect = cv::Rect(x, y, w, h);
scoredRect.score = scoredRect.rect.area() > 0 ? obj.prob : 0;
scoredRect.properties["time"] = getProperty("time");
+ scoredRect.properties["imgKey"]=getProperty("imgKey");
if (trackingTrigger->triggerOnce(scoredRect))
{
trackingTrigger->getLastRect().properties["id"] = to_string(scoredRect.id);
trackingTrigger->getLastRect().properties["type"] = cocoData[obj.type];
trackingTrigger->getLastRect().properties["time"] = getProperty("time");
+ trackingTrigger->getLastRect().properties["imgKey"]=getProperty("imgKey");
// DBG("time)"<<getProperty("time"));
triggerScoredRects.push_back(trackingTrigger->getLastRect());
}
--
Gitblit v1.8.0