From d5849806de2339beaec4216ede8ffbbf803e6f19 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期一, 29 七月 2019 13:32:24 +0800
Subject: [PATCH] ---
---
ruleserver/personTrack.go | 41 ++++++++++++++++++++++++++++-------------
1 files changed, 28 insertions(+), 13 deletions(-)
diff --git a/ruleserver/personTrack.go b/ruleserver/personTrack.go
index 5d0a7e0..0958840 100644
--- a/ruleserver/personTrack.go
+++ b/ruleserver/personTrack.go
@@ -17,25 +17,31 @@
Score float32
}
+var num int = 5
// 妫�鏌ユ槸鍚﹀墠鍚庝袱娆＄殑鏁版嵁id鏄惁瀹屽叏鐩稿悓锛堜汉鑴稿拰yolo锛� 鏀逛负鐩存帴妫�鏌ユ暟閲忔槸鍚︿竴鑷�
func IsSame(msg *protomsg.SdkMessage) {
- logger.Debug("+++++++++++++++++++++杩借釜寮�濮�+++++++++++++++鎽勫儚鏈篿d涓猴細", msg.Cid)
- logger.Debug("---------------------缂撳瓨姹�--------------------------锛�", TrackPond)
+ logger.Debug("+++++++++++++++++++++杩借釜寮�濮�+++++++++++++++鎽勫儚鏈篿d涓猴細", msg.Cid, "---缂撳瓨姹犱负锛�", TrackPond)
for _, sdkinfo := range msg.Tasklab.Sdkinfos { // 閬嶅巻鍚勭畻娉曠殑sdkData
if sdkinfo.Sdktype == "FaceDetect" { // 浜鸿劯妫�娴�
logger.Info("鏁版嵁闀垮害涓猴細", len(sdkinfo.Sdkdata))
if len(sdkinfo.Sdkdata) > 1 {
+ num = 5
FaceIsInPond(msg.Cid, sdkinfo)
} else {
- if TrackPond[msg.Cid] != nil {
- logger.Info("濡傛灉涓嶄负绌猴細", TrackPond[msg.Cid])
- TrackPond[msg.Cid].Faces = nil
+ if num > 0 { // 杩炵画num娆℃病鏈夋暟鎹墠绠楁槸娌℃湁鏁版嵁锛屼笉鐒跺彧绠椾綔涓㈠抚
+ logger.Info("鎴戣涓轰綘鍙槸涓㈠抚浜�,姝ゆ椂鐨刵um鍊间负锛�",num)
+ num--
} else {
- TrackPond[msg.Cid] = &PersonTrack{Faces: nil}
- logger.Info("濡傛灉涓虹┖锛�", TrackPond[msg.Cid])
+ if TrackPond[msg.Cid] != nil {
+ logger.Info("濡傛灉涓嶄负绌猴細", TrackPond[msg.Cid])
+ TrackPond[msg.Cid].Faces = nil
+ } else {
+ TrackPond[msg.Cid] = &PersonTrack{Faces: nil}
+ logger.Info("濡傛灉涓虹┖锛�", TrackPond[msg.Cid])
+ }
+ logger.Info("鎽勫儚鏈�:" + msg.Cid + "-娌℃湁浜鸿劯锛岃閲嶇疆涓虹┖")
+ continue
}
- logger.Info("鎽勫儚鏈�:" + msg.Cid + "-娌℃湁浜鸿劯锛岃閲嶇疆涓虹┖")
- continue
}
}
if sdkinfo.Sdktype == "Yolo" {
@@ -96,7 +102,7 @@
if err != nil {
logger.Info("瑙ｆ瀽face sdk鏁版嵁鏃跺嚭鐜伴敊璇�", err)
}
- logger.Info("================杩借釜涔嬪墠浜鸿劯鐨勪釜鏁帮細", len(faceParam.Faces), "杩樻病鏈夎繖涓憚鍍忔満鐨勭紦瀛�")
+ logger.Info("================杩借釜涔嬪墠浜鸿劯鐨勪釜鏁帮細", len(faceParam.Faces))
var facesTemp = faceParam.Faces // 鍏堟妸鏁版嵁杞瓨涓�浠斤紝涓嶇劧涓�浼氬効鏁版嵁鍒犲噺涔嬪悗鎵句笉鍒板師濮嬫暟鎹紝涓嶈兘璁╃紦瀛樻暟鎹洿鏂颁簡
for i := 0; i < len(faceParam.Faces); {
faceFlag := false
@@ -105,20 +111,28 @@
faceFlag = true
//return "true"
faceParam.Faces = append(faceParam.Faces[:i], faceParam.Faces[i+1:]...)
+ logger.Info("鍒嗗�间负锛�",faceParam.Faces[i].Pos.FAngle.Confidence,"--缂撳瓨鐨勫垎鍊间负锛�",val.Score,"姝ゆ暟鎹敱浜庡湪姹犲瓙涓笖鍒嗗�兼洿浣庯紝鏄琚姏寮冪殑鏁版嵁")
break
}
- if faceParam.Faces[i].Pos.FaceID == val.Id && faceParam.Faces[i].Pos.FAngle.Confidence <= val.Score { // 鍦ㄦ睜瀛愰噷骞朵笖鍒嗗�兼洿楂橈紝鏇存柊缂撳瓨
+ if faceParam.Faces[i].Pos.FaceID == val.Id && faceParam.Faces[i].Pos.FAngle.Confidence > val.Score { // 鍦ㄦ睜瀛愰噷骞朵笖鍒嗗�兼洿楂橈紝鏇存柊缂撳瓨
faceFlag = true
- logger.Info("鍒嗗�肩敱", val.Score, "鏇存柊涓猴細", faceParam.Faces[i].Pos.FAngle.Confidence)
+ logger.Info("鍒嗗�肩敱", val.Score, "鏇存柊涓猴細", faceParam.Faces[i].Pos.FAngle.Confidence, "姝ゆ暟鎹敱浜庡湪姹犲瓙涓笖鍒嗗�兼洿楂橈紝鏄琚紶閫掍笅鍘荤殑鏁版嵁")
val.Score = faceParam.Faces[i].Pos.FAngle.Confidence
}
}
if !faceFlag { // 姝や汉鑴镐笉鍦ㄦ睜瀛愪腑
+ logger.Info("娣诲姞鏁版嵁鏇存柊缂撳瓨")
TrackPond[cameraId].Faces = append(TrackPond[cameraId].Faces, &Face{faceParam.Faces[i].Pos.FaceID, faceParam.Faces[i].Pos.FAngle.Confidence})
i++
}
}
- // 鍙嶅悜寰幆 锛岀湅閭ｄ簺缂撳瓨鏈夎�屾暟鎹病鏈夌殑
+ logger.Info("鍙嶅簭鍒楀寲閲嶆柊瑁呴厤涔嬪墠浜鸿劯鐨勪釜鏁帮細",len(faceParam.Faces))
+ sdkinfor.Sdkdata, err = proto.Marshal(&faceParam)
+ if err != nil {
+ logger.Error("yolo搴忓垪鍖栭敊璇�", err)
+ }
+ logger.Info("璺熶箣鍓嶇浉鍚岋紝娓呯┖yolo鏁版嵁")
+ // 鍙嶅悜寰幆 锛岀湅閭ｄ簺缂撳瓨鏈夎�屾暟鎹病鏈夌殑灏卞垹闄ゆ暟鎹洿鏂扮紦瀛�
for i := 0; i < len(TrackPond[cameraId].Faces); {
flag := false
for _, temp := range facesTemp {
@@ -130,6 +144,7 @@
i++
} else {
// 姝ゆ暟鎹湪缂撳瓨涓絾涓嶅湪鏉ョ殑鏁版嵁甯т腑锛屽垹闄ゆ鏁版嵁鏇存柊缂撳瓨
+ logger.Info("鍒犻櫎鏁版嵁鏇存柊缂撳瓨")
TrackPond[cameraId].Faces = append(TrackPond[cameraId].Faces[:i], TrackPond[cameraId].Faces[i+1:]...)
}
}
--
Gitblit v1.8.0