From 6540a2a9d69432c4cc475e3b32eae11e9e0ace73 Mon Sep 17 00:00:00 2001
From: chenshijun <csj_sky@126.com>
Date: 星期四, 11 四月 2019 20:28:10 +0800
Subject: [PATCH] 1.srs的分辨率在config.json配置 2.单播推流控制，国标摄像机差一个关闭测试 3. 底库字段添加
---
QiaoJiaSystem/StructureApp/TrackingTrigger.h | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/QiaoJiaSystem/StructureApp/TrackingTrigger.h b/QiaoJiaSystem/StructureApp/TrackingTrigger.h
index 2e86b19..05ccc42 100644
--- a/QiaoJiaSystem/StructureApp/TrackingTrigger.h
+++ b/QiaoJiaSystem/StructureApp/TrackingTrigger.h
@@ -9,8 +9,9 @@
using namespace std;
struct ScoredRect {
- ScoredRect() : id(-1) ,isMove(false){}
+ ScoredRect() : id(-1) ,isMove(false),times(0){}
bool isMove;
+ time_t times;
float score;
cv::Rect rect;
long id;
@@ -28,6 +29,8 @@
if (lastRect.id >= 0 && (rect.rect & lastRect.rect).area() > lastRect.rect.area() * 0.4) {
found = true;
rect.id = lastRect.id;
+ lastRect.properties["time"]=rect.properties["time"];
+ lastRect.properties["imgKey"]=rect.properties["imgKey"];
rect.properties = lastRect.properties;
tempScoreRects.push_back(rect);
break;
--
Gitblit v1.8.0