From 3fc92c3ead67b494fa4c99cdcc5edb31bdd40d69 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期四, 12 九月 2019 13:49:28 +0800
Subject: [PATCH] label重大更新
---
ruleserver/personTrack.go | 40 +++++++++++++++++++++++++++++-----------
1 files changed, 29 insertions(+), 11 deletions(-)
diff --git a/ruleserver/personTrack.go b/ruleserver/personTrack.go
index 33c6ae9..19bec0c 100644
--- a/ruleserver/personTrack.go
+++ b/ruleserver/personTrack.go
@@ -17,7 +17,7 @@
Score float32
}
-var num int = 5
+var num int = 25
// 妫�鏌ユ槸鍚﹀墠鍚庝袱娆＄殑鏁版嵁id鏄惁瀹屽叏鐩稿悓锛堜汉鑴革級
func FaceIsSame(msg *protomsg.SdkMessage) {
logger.Debug("+++++++++++++++++++++杩借釜寮�濮�+++++++++++++++鎽勫儚鏈篿d涓猴細", msg.Cid, "---缂撳瓨姹犱负锛�", TrackPond)
@@ -25,7 +25,7 @@
if sdkinfo.Sdktype == "FaceDetect" { // 浜鸿劯妫�娴�
logger.Info("鏁版嵁闀垮害涓猴細", len(sdkinfo.Sdkdata))
if len(sdkinfo.Sdkdata) > 1 {
- num = 5
+ num = 25
FaceIsInPond(msg.Cid, sdkinfo)
} else {
if num > 0 { // 杩炵画num娆℃病鏈夋暟鎹墠绠楁槸娌℃湁鏁版嵁锛屼笉鐒跺彧绠椾綔涓㈠抚
@@ -45,11 +45,11 @@
}
}
}
- logger.Debug("---------------------------------------浜鸿劯杩借釜缁撴潫--------------------------------------")
+ logger.Debug("--------------------------------浜鸿劯杩借釜缁撴潫--------------------------------------")
}
// 杩借釜浜轰綋锛屾鏌ユ暟閲忔槸鍚︿竴鑷�
-func BodyIsSame(msg *protomsg.SdkMessage) {
+func BodyIsSame(msg *protomsg.SdkMessage) bool{
logger.Debug("+++++++++++++++++++++杩借釜寮�濮�+++++++++++++++鎽勫儚鏈篿d涓猴細", msg.Cid, "---缂撳瓨姹犱负锛�", TrackPond)
for _, sdkinfo := range msg.Tasklab.Sdkinfos { // 閬嶅巻鍚勭畻娉曠殑sdkData
if sdkinfo.Sdktype == "Yolo" {
@@ -72,12 +72,13 @@
logger.Info("================杩借釜涔嬪墠yolo鐨勪釜鏁帮細", yoloNum, "杩樻病鏈夎繖涓憚鍍忔満鐨勭紦瀛�")
}
if yoloParam.Infos != nil && TrackPond[msg.Cid] != nil && yoloNum == TrackPond[msg.Cid].Yolo { // yolo鐨勫鏋滄暟閲忕浉鍚屽垯瑙嗕负涓嶅彉銆佹妸yolo鐨剆dkData娓呯┖
- yoloParam.Infos = (yoloParam.Infos)[0:0]
- sdkinfo.Sdkdata, err = proto.Marshal(&yoloParam)
- if err != nil {
- logger.Error("yolo搴忓垪鍖栭敊璇�", err)
- }
+ //yoloParam.Infos = (yoloParam.Infos)[0:0]
+ //sdkinfo.Sdkdata, err = proto.Marshal(&yoloParam)
+ //if err != nil {
+ // logger.Error("yolo搴忓垪鍖栭敊璇�", err)
+ //}
logger.Info("璺熶箣鍓嶇浉鍚岋紝娓呯┖yolo鏁版嵁")
+ return true
} else {
if TrackPond[msg.Cid] != nil {
logger.Info("鏇存柊褰撳墠鎽勫儚鏈虹紦瀛樻睜涓殑yolo涓暟锛�", yoloNum)
@@ -86,6 +87,7 @@
logger.Info("鏂板缓褰撳墠鎽勫儚鏈虹紦瀛樻睜涓殑yolo涓暟锛�", yoloNum)
TrackPond[msg.Cid] = &PersonTrack{Yolo: yoloNum}
}
+ return false
}
} else {
if TrackPond[msg.Cid] != nil {
@@ -98,7 +100,18 @@
}
}
}
- logger.Debug("---------------------------------------杩借釜缁撴潫--------------------------------------")
+ logger.Debug("---------------------------------杩借釜缁撴潫--------------------------------------")
+ return false
+}
+func TrackOrNot(label map[string]interface{}) bool{
+ if label["yolo"] != nil && len(label["yolo"].([]Result)) > 0 {
+ for _,res := range label["yolo"].([]Result) {
+ if res.TimeLabel == "10" {
+ return true
+ }
+ }
+ }
+ return false
}
// 杩囨护鎺夐偅浜涘凡鍦ㄧ紦瀛樹腑涓斿垎鍊兼洿浣庣殑浜鸿劯锛屾洿鏂扮紦瀛橈紙娌℃湁鐨勫姞涓婏紝鍒嗗�兼洿鏂颁负鏇撮珮鐨勶紝澶氱殑鍒犻櫎锛�
@@ -111,7 +124,12 @@
logger.Info("瑙ｆ瀽face sdk鏁版嵁鏃跺嚭鐜伴敊璇�", err)
}
logger.Info("================杩借釜涔嬪墠浜鸿劯鐨勪釜鏁帮細", len(faceParam.Faces))
- var facesTemp = faceParam.Faces // 鍏堟妸鏁版嵁杞瓨涓�浠斤紝涓嶇劧涓�浼氬効鏁版嵁鍒犲噺涔嬪悗鎵句笉鍒板師濮嬫暟鎹紝涓嶈兘璁╃紦瀛樻暟鎹洿鏂颁簡
+
+ var facesTemp []protomsg.ResultFaceDetect
+ for _,face := range faceParam.Faces {
+ facesTemp = append(facesTemp,*face) // 鍏堟妸鏁版嵁杞瓨涓�浠斤紝涓嶇劧涓�浼氬効鏁版嵁鍒犲噺涔嬪悗鎵句笉鍒板師濮嬫暟鎹紝涓嶈兘璁╃紦瀛樻暟鎹洿鏂颁簡
+ }
+
for i := 0; i < len(faceParam.Faces); {
faceFlag := false
for _, val := range TrackPond[cameraId].Faces {
--
Gitblit v1.8.0