From 11c71f8ace448b799a4db143071a4c7cf57859cd Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期六, 27 七月 2019 18:54:00 +0800
Subject: [PATCH] ---
---
ruleserver/personTrack.go | 154 +++++++++++++++++++++++++++------------------------
1 files changed, 82 insertions(+), 72 deletions(-)
diff --git a/ruleserver/personTrack.go b/ruleserver/personTrack.go
index ab4d4ce..d8482fe 100644
--- a/ruleserver/personTrack.go
+++ b/ruleserver/personTrack.go
@@ -9,10 +9,12 @@
var TrackPond = make(map[string]*PersonTrack)
type PersonTrack struct {
- Face int // 浜鸿劯鐨刬d鏁扮粍 鏀逛负鏁伴噺
- FaceN int // 娣诲姞瀹归敊锛屽垵濮嬪�间负5锛岃繛缁�5娆′笉瀵规墠绠椾笉瀵�
- Yolo int // yolo瀵硅薄鐨刬d鏁扮粍 鏀逛负鏁伴噺
- YoloN int // 娣诲姞瀹归敊锛屽垵濮嬪�间负5锛岃繛缁�5娆′笉瀵规墠绠椾笉瀵�
+ Faces []*Face // 浜鸿劯鐨勬暟缁� 鏀逛负鏁伴噺
+ Yolo int // yolo瀵硅薄鐨刬d鏁扮粍 鏀逛负鏁伴噺
+}
+type Face struct {
+ Id uint64
+ Score float32
}
// 妫�鏌ユ槸鍚﹀墠鍚庝袱娆＄殑鏁版嵁id鏄惁瀹屽叏鐩稿悓锛堜汉鑴稿拰yolo锛� 鏀逛负鐩存帴妫�鏌ユ暟閲忔槸鍚︿竴鑷�
@@ -22,41 +24,14 @@
for _, sdkinfo := range msg.Tasklab.Sdkinfos { // 閬嶅巻鍚勭畻娉曠殑sdkData
if sdkinfo.Sdktype == "FaceDetect" { // 浜鸿劯妫�娴�
if len(sdkinfo.Sdkdata) > 1 {
- faceParam := protomsg.ParamFacePos{}
- err := proto.Unmarshal(sdkinfo.Sdkdata, &faceParam)
- if err != nil {
- logger.Info("瑙ｆ瀽face sdk鏁版嵁鏃跺嚭鐜伴敊璇�", err)
- continue
- }
- logger.Info("================杩借釜涔嬪墠浜鸿劯鐨勪釜鏁帮細", len(faceParam.Faces))
- if faceParam.Faces != nil && TrackPond[msg.Cid] != nil && len(faceParam.Faces) == TrackPond[msg.Cid].Face { // yolo鐨勫鏋滄暟閲忕浉鍚屽垯瑙嗕负涓嶅彉銆佹妸yolo鐨剆dkData娓呯┖
- faceParam.Faces = (faceParam.Faces)[0:0]
- sdkinfo.Sdkdata, err = proto.Marshal(&faceParam)
- if err != nil {
- logger.Error("浜鸿劯搴忓垪鍖栭敊璇�", err)
- }
- logger.Info("===================杩借釜涓�斾汉鑴哥殑涓暟", len(faceParam.Faces))
- } else {
- if TrackPond[msg.Cid] != nil {
- if TrackPond[msg.Cid].FaceN > 0 {
- TrackPond[msg.Cid].FaceN--
- }
- if TrackPond[msg.Cid].FaceN == 0 { //姝ゆ椂杩炵画浜旀涓嶅
- TrackPond[msg.Cid].Face = len(faceParam.Faces)
- TrackPond[msg.Cid].FaceN = 5
- }
- } else {
- TrackPond[msg.Cid] = &PersonTrack{Face: len(faceParam.Faces),FaceN:5}
- }
- }
- //for i := 0; i < len(faceParam.Faces); {
- // if flag := IsInPond(msg.Cid,faceParam.Faces[i]);flag { // 宸茬粡瀛樺湪锛屼粠msg鐨勪汉鑴告暟缁勪腑鍒犻櫎杩欎釜鍏冪礌锛屼笉蹇呬紶鍒颁笅涓�涓幆鑺�
- // faceParam.Faces = append(faceParam.Faces[:i], faceParam.Faces[i+1:]...)
- // } else {
- // i++
- // }
- //}
+ FaceIsInPond(msg.Cid,sdkinfo)
} else {
+ if TrackPond[msg.Cid] != nil {
+ TrackPond[msg.Cid].Faces = nil
+ } else {
+ TrackPond[msg.Cid] = &PersonTrack{Faces: nil}
+ }
+ logger.Info("鎽勫儚鏈�:" + msg.Cid + "-娌℃湁浜鸿劯锛岃閲嶇疆涓虹┖")
continue
}
}
@@ -74,28 +49,34 @@
yoloNum++
}
}
- logger.Info("================杩借釜涔嬪墠yolo鐨勪釜鏁帮細", yoloNum)
+ if TrackPond[msg.Cid] != nil {
+ logger.Info("================杩借釜涔嬪墠yolo鐨勪釜鏁帮細", yoloNum, "鐜板湪缂撳瓨姹犱腑璁板綍鐨勪釜鏁帮細", TrackPond[msg.Cid].Yolo)
+ } else {
+ 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)
}
+ logger.Info("璺熶箣鍓嶇浉鍚岋紝娓呯┖yolo鏁版嵁")
} else {
if TrackPond[msg.Cid] != nil {
+ logger.Info("鏇存柊褰撳墠鎽勫儚鏈虹紦瀛樻睜涓殑yolo涓暟锛�", yoloNum)
TrackPond[msg.Cid].Yolo = yoloNum
- if TrackPond[msg.Cid].YoloN > 0 {
- TrackPond[msg.Cid].YoloN--
- }
- if TrackPond[msg.Cid].YoloN == 0 { //姝ゆ椂杩炵画浜旀涓嶅
- TrackPond[msg.Cid].Yolo = yoloNum
- TrackPond[msg.Cid].YoloN = 5
- }
} else {
- TrackPond[msg.Cid] = &PersonTrack{Yolo: yoloNum,YoloN:5}
+ logger.Info("鏂板缓褰撳墠鎽勫儚鏈虹紦瀛樻睜涓殑yolo涓暟锛�", yoloNum)
+ TrackPond[msg.Cid] = &PersonTrack{Yolo: yoloNum}
}
}
} else {
+ if TrackPond[msg.Cid] != nil {
+ TrackPond[msg.Cid].Yolo = 0
+ } else {
+ TrackPond[msg.Cid] = &PersonTrack{Yolo: 0}
+ }
+ logger.Info("鎽勫儚鏈�:" + msg.Cid + "-娌℃湁yolo锛岃閲嶇疆涓�0")
continue
}
}
@@ -103,28 +84,57 @@
logger.Debug("---------------------------------------杩借釜缁撴潫--------------------------------------")
}
-//// 鍒ゆ柇涓�涓汉鑴竔d鍦ㄤ笉鍦ㄨ拷韪睜涓�
-//func FaceIsInPond(cameraId string,face *protomsg.ResultFaceDetect) bool{
-// if TrackPond[cameraId].Face > 0 {
-// for key,val := range TrackPond {
-// if key == cameraId {
-// faceFlag := false
-// for faceId := range val.Face {
-// if face.Pos.FaceID == uint64(faceId) { // 姝や汉鑴稿凡鍦ㄦ睜瀛愪腑锛屼笉闇�瑕佸畠鍒颁笅涓�涓幆鑺備簡
-// faceFlag = true
-// return true
-// }
-// }
-// if !faceFlag { // 姝や汉鑴镐笉鍦ㄦ睜瀛愪腑
-// val.Face = append(val.Face,face.Pos.FaceID)
-// return false
-// }
-// }else {
-// return false
-// }
-// }
-// } else {
-// return false
-// }
-// return false
-//}
+// 杩囨护鎺夐偅浜涘凡鍦ㄧ紦瀛樹腑涓斿垎鍊兼洿浣庣殑浜鸿劯锛屾洿鏂扮紦瀛橈紙娌℃湁鐨勫姞涓婏紝鍒嗗�兼洿鏂颁负鏇撮珮鐨勶紝澶氱殑鍒犻櫎锛�
+func FaceIsInPond(cameraId string, sdkinfo *protomsg.SdkmsgWithTask) string {
+ if TrackPond[cameraId] != nil && len(TrackPond[cameraId].Faces) > 0 {
+ faceParam := protomsg.ParamFacePos{}
+ err := proto.Unmarshal(sdkinfo.Sdkdata, &faceParam)
+ if err != nil {
+ logger.Info("瑙ｆ瀽face sdk鏁版嵁鏃跺嚭鐜伴敊璇�", err)
+ }
+ if TrackPond[cameraId] != nil {
+ logger.Info("================杩借釜涔嬪墠浜鸿劯鐨勪釜鏁帮細", len(faceParam.Faces), "鐜板湪缂撳瓨姹犱腑璁板綍鐨勪釜鏁帮細", len(TrackPond[cameraId].Faces))
+ } else {
+ logger.Info("================杩借釜涔嬪墠浜鸿劯鐨勪釜鏁帮細", len(faceParam.Faces), "杩樻病鏈夎繖涓憚鍍忔満鐨勭紦瀛�")
+ }
+ var facesTemp = faceParam.Faces // 鍏堟妸鏁版嵁杞瓨涓�浠斤紝涓嶇劧涓�浼氬効鏁版嵁鍒犲噺涔嬪悗鎵句笉鍒板師濮嬫暟鎹紝涓嶈兘璁╃紦瀛樻暟鎹洿鏂颁簡
+ for i := 0 ;i < len(faceParam.Faces); {
+ faceFlag := false
+ for _, val := range TrackPond[cameraId].Faces {
+ if faceParam.Faces[i].Pos.FaceID == val.Id && faceParam.Faces[i].Pos.FAngle.Confidence <= val.Score{ // 鍦ㄦ睜瀛愰噷骞朵笖鍒嗗�兼洿浣庯紝鏄鎶涘純鐨勬暟鎹�
+ faceFlag = true
+ //return "true"
+ faceParam.Faces = append(faceParam.Faces[:i], faceParam.Faces[i+1:]...)
+ break
+ }
+ 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)
+ val.Score = faceParam.Faces[i].Pos.FAngle.Confidence
+ }
+ }
+ if !faceFlag { // 姝や汉鑴镐笉鍦ㄦ睜瀛愪腑
+ TrackPond[cameraId].Faces = append(TrackPond[cameraId].Faces, &Face{faceParam.Faces[i].Pos.FaceID,faceParam.Faces[i].Pos.FAngle.Confidence})
+ i++
+ }
+ }
+ // 鍙嶅悜寰幆 锛岀湅閭ｄ簺缂撳瓨鏈夎�屾暟鎹病鏈夌殑
+ for i := 0; i < len(TrackPond[cameraId].Faces); {
+ flag := false
+ for _,temp := range facesTemp {
+ if TrackPond[cameraId].Faces[i].Id == temp.Pos.FaceID {
+ flag = true
+ }
+ }
+ if flag {
+ i++
+ } else {
+ // 姝ゆ暟鎹湪缂撳瓨涓絾涓嶅湪鏉ョ殑鏁版嵁甯т腑锛屽垹闄ゆ鏁版嵁鏇存柊缂撳瓨
+ TrackPond[cameraId].Faces = append(TrackPond[cameraId].Faces[:i],TrackPond[cameraId].Faces[i+1:]...)
+ }
+ }
+ } else {
+ return "false"
+ }
+ return "false"
+}
--
Gitblit v1.8.0