From db16d6383bfec3388b091b734007bd29cf8bbf20 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期六, 02 十一月 2019 16:55:56 +0800
Subject: [PATCH] ---
---
ruleserver/personTrack.go | 63 +++++++++++++++++++++++--------
1 files changed, 46 insertions(+), 17 deletions(-)
diff --git a/ruleserver/personTrack.go b/ruleserver/personTrack.go
index 33c6ae9..eb4fe23 100644
--- a/ruleserver/personTrack.go
+++ b/ruleserver/personTrack.go
@@ -3,7 +3,8 @@
import (
"basic.com/pubsub/protomsg.git"
"github.com/golang/protobuf/proto"
- "ruleprocess/logger"
+ "basic.com/valib/logger.git"
+ "ruleprocess/structure"
)
var TrackPond = make(map[string]*PersonTrack)
@@ -17,15 +18,15 @@
Score float32
}
-var num int = 5
+var num int = 25
// 妫�鏌ユ槸鍚﹀墠鍚庝袱娆＄殑鏁版嵁id鏄惁瀹屽叏鐩稿悓锛堜汉鑴革級
func FaceIsSame(msg *protomsg.SdkMessage) {
- logger.Debug("+++++++++++++++++++++杩借釜寮�濮�+++++++++++++++鎽勫儚鏈篿d涓猴細", msg.Cid, "---缂撳瓨姹犱负锛�", 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
+ num = 25
FaceIsInPond(msg.Cid, sdkinfo)
} else {
if num > 0 { // 杩炵画num娆℃病鏈夋暟鎹墠绠楁槸娌℃湁鏁版嵁锛屼笉鐒跺彧绠椾綔涓㈠抚
@@ -45,12 +46,12 @@
}
}
}
- logger.Debug("---------------------------------------浜鸿劯杩借釜缁撴潫--------------------------------------")
+ logger.Debug("--------------------------------浜鸿劯杩借釜缁撴潫--------------------------------------")
}
// 杩借釜浜轰綋锛屾鏌ユ暟閲忔槸鍚︿竴鑷�
-func BodyIsSame(msg *protomsg.SdkMessage) {
- logger.Debug("+++++++++++++++++++++杩借釜寮�濮�+++++++++++++++鎽勫儚鏈篿d涓猴細", msg.Cid, "---缂撳瓨姹犱负锛�", TrackPond)
+func BodyIsSame(args *structure.SdkDatas,msg *protomsg.SdkMessage) bool{
+ logger.Debug("+++++++++++++++++++++浜轰綋杩借釜寮�濮�+++++++++++++++鎽勫儚鏈篿d涓猴細", msg.Cid, "---缂撳瓨姹犱负锛�", TrackPond)
for _, sdkinfo := range msg.Tasklab.Sdkinfos { // 閬嶅巻鍚勭畻娉曠殑sdkData
if sdkinfo.Sdktype == "Yolo" {
if len(sdkinfo.Sdkdata) > 1 {
@@ -77,7 +78,10 @@
if err != nil {
logger.Error("yolo搴忓垪鍖栭敊璇�", err)
}
- logger.Info("璺熶箣鍓嶇浉鍚岋紝娓呯┖yolo鏁版嵁")
+ delete(args.RuleResult,"yolo")
+ logger.Info("娓呴櫎yolo鏍囩锛�",args.RuleResult["yolo"])
+ logger.Info("璺熶箣鍓嶇浉鍚岋紝娓呯┖yolo鏁版嵁锛屼汉浣撹拷韪粨鏉�")
+ return true
} else {
if TrackPond[msg.Cid] != nil {
logger.Info("鏇存柊褰撳墠鎽勫儚鏈虹紦瀛樻睜涓殑yolo涓暟锛�", yoloNum)
@@ -86,6 +90,8 @@
logger.Info("鏂板缓褰撳墠鎽勫儚鏈虹紦瀛樻睜涓殑yolo涓暟锛�", yoloNum)
TrackPond[msg.Cid] = &PersonTrack{Yolo: yoloNum}
}
+ logger.Debug("---------------------------------浜轰綋杩借釜缁撴潫--------------------------------------")
+ return false
}
} else {
if TrackPond[msg.Cid] != nil {
@@ -98,20 +104,41 @@
}
}
}
- logger.Debug("---------------------------------------杩借釜缁撴潫--------------------------------------")
+ logger.Debug("---------------------------------浜轰綋杩借釜缁撴潫--------------------------------------")
+ return false
+}
+func TrackOrNot(label map[string]interface{}) bool{
+ if label["yolo"] != nil && len(label["yolo"].([]structure.Result)) > 0 {
+ for _,res := range label["yolo"].([]structure.Result) {
+ if res.TimeLabel == "10" {
+ return true
+ }
+ }
+ }
+ return false
}
// 杩囨护鎺夐偅浜涘凡鍦ㄧ紦瀛樹腑涓斿垎鍊兼洿浣庣殑浜鸿劯锛屾洿鏂扮紦瀛橈紙娌℃湁鐨勫姞涓婏紝鍒嗗�兼洿鏂颁负鏇撮珮鐨勶紝澶氱殑鍒犻櫎锛�
-func FaceIsInPond(cameraId string, sdkinfor *protomsg.SdkmsgWithTask) string {
+func FaceIsInPond(cameraId string, sdkinfor *protomsg.SdkmsgWithTask) {
if TrackPond[cameraId] != nil {
logger.Info("----椹墠鐐細", TrackPond[cameraId], "=====", len(TrackPond[cameraId].Faces))
+ for _,face := range TrackPond[cameraId].Faces {
+ logger.Info("缂撳瓨涓瓨鍌ㄧ殑face鏁版嵁锛�",face.Id,face.Score)
+ }
faceParam := protomsg.ParamFacePos{}
err := proto.Unmarshal(sdkinfor.Sdkdata, &faceParam)
if err != nil {
logger.Info("瑙ｆ瀽face sdk鏁版嵁鏃跺嚭鐜伴敊璇�", err)
}
logger.Info("================杩借釜涔嬪墠浜鸿劯鐨勪釜鏁帮細", len(faceParam.Faces))
- var facesTemp = faceParam.Faces // 鍏堟妸鏁版嵁杞瓨涓�浠斤紝涓嶇劧涓�浼氬効鏁版嵁鍒犲噺涔嬪悗鎵句笉鍒板師濮嬫暟鎹紝涓嶈兘璁╃紦瀛樻暟鎹洿鏂颁簡
+ for _,face := range faceParam.Faces {
+ logger.Info("鏂版潵鐨勭殑face鏁版嵁锛�",face.Pos.FaceID,face.Pos.FAngle.Confidence)
+ }
+ 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 {
@@ -129,17 +156,20 @@
}
}
if !faceFlag { // 姝や汉鑴镐笉鍦ㄦ睜瀛愪腑
- logger.Info("娣诲姞鏁版嵁鏇存柊缂撳瓨")
+ 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))
+ logger.Info("涓存椂瀛樺偍鐨勬柊鏉ユ暟鎹細")
+ for _, temp := range facesTemp {
+ logger.Info("涓存椂瀛樺偍鐨勬柊鏉ョ殑鐨刦ace鏁版嵁锛�",temp.Pos.FaceID,temp.Pos.FAngle.Confidence)
+ }
sdkinfor.Sdkdata, err = proto.Marshal(&faceParam)
if err != nil {
- logger.Error("yolo搴忓垪鍖栭敊璇�", err)
+ logger.Error("浜鸿劯搴忓垪鍖栭敊璇�", err)
}
- logger.Info("璺熶箣鍓嶇浉鍚岋紝娓呯┖yolo鏁版嵁")
// 鍙嶅悜寰幆 锛岀湅閭ｄ簺缂撳瓨鏈夎�屾暟鎹病鏈夌殑灏卞垹闄ゆ暟鎹洿鏂扮紦瀛�
for i := 0; i < len(TrackPond[cameraId].Faces); {
flag := false
@@ -152,12 +182,11 @@
i++
} else {
// 姝ゆ暟鎹湪缂撳瓨涓絾涓嶅湪鏉ョ殑鏁版嵁甯т腑锛屽垹闄ゆ鏁版嵁鏇存柊缂撳瓨
- logger.Info("鍒犻櫎鏁版嵁鏇存柊缂撳瓨")
+ logger.Info("鍒犻櫎姹犲瓙涓殑鏁版嵁鏇存柊缂撳瓨")
TrackPond[cameraId].Faces = append(TrackPond[cameraId].Faces[:i], TrackPond[cameraId].Faces[i+1:]...)
}
}
} else {
- return "false"
+ TrackPond[cameraId] = &PersonTrack{Faces: nil}
}
- return "false"
}
--
Gitblit v1.8.0