From 0e669ac6b266466fec8472d02b3ce87134de82a7 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期二, 23 七月 2019 18:52:25 +0800
Subject: [PATCH] 容错5改为3
---
ruleserver/personTrack.go | 89 ++++++++++++++++++++++++++++++++------------
1 files changed, 65 insertions(+), 24 deletions(-)
diff --git a/ruleserver/personTrack.go b/ruleserver/personTrack.go
index ac3a822..83007e0 100644
--- a/ruleserver/personTrack.go
+++ b/ruleserver/personTrack.go
@@ -9,17 +9,16 @@
var TrackPond = make(map[string]*PersonTrack)
type PersonTrack struct {
- Face int // 浜鸿劯鐨刬d鏁扮粍 鏀逛负鏁伴噺
- Yolo int // yolo瀵硅薄鐨刬d鏁扮粍 鏀逛负鏁伴噺
+ Face int // 浜鸿劯鐨刬d鏁扮粍 鏀逛负鏁伴噺
+ FaceN int // 娣诲姞瀹归敊锛屽垵濮嬪�间负5锛岃繛缁�5娆′笉瀵规墠绠椾笉瀵�
+ Yolo int // yolo瀵硅薄鐨刬d鏁扮粍 鏀逛负鏁伴噺
+ YoloN int // 娣诲姞瀹归敊锛屽垵濮嬪�间负5锛岃繛缁�5娆′笉瀵规墠绠椾笉瀵�
}
-func (pt *PersonTrack) Set(msg protomsg.SdkMessage) {
-
-}
-
-// 妫�鏌ユ槸鍚﹀墠鍚庝袱娆＄殑鏁版嵁id鏄惁瀹屽叏鐩稿悓锛堜汉鑴稿拰yolo锛�
+// 妫�鏌ユ槸鍚﹀墠鍚庝袱娆＄殑鏁版嵁id鏄惁瀹屽叏鐩稿悓锛堜汉鑴稿拰yolo锛� 鏀逛负鐩存帴妫�鏌ユ暟閲忔槸鍚︿竴鑷�
func IsSame(msg *protomsg.SdkMessage) {
- logger.Debug("++++++++++++++++++++++++++++杩借釜寮�濮�++++++++++++++++++++++++")
+ logger.Debug("+++++++++++++++++++++杩借釜寮�濮�+++++++++++++++鎽勫儚鏈篿d涓猴細", msg.Cid)
+ logger.Debug("---------------------缂撳瓨姹�--------------------------锛�", TrackPond)
for _, sdkinfo := range msg.Tasklab.Sdkinfos { // 閬嶅巻鍚勭畻娉曠殑sdkData
if sdkinfo.Sdktype == "FaceDetect" { // 浜鸿劯妫�娴�
if len(sdkinfo.Sdkdata) > 1 {
@@ -29,20 +28,35 @@
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].Yolo { // yolo鐨勫鏋滄暟閲忕浉鍚屽垯瑙嗕负涓嶅彉銆佹妸yolo鐨剆dkData娓呯┖
+ 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]
- logger.Info("===================杩借釜涓�斾汉鑴哥殑涓暟",len(faceParam.Faces))
+ sdkinfo.Sdkdata, err = proto.Marshal(&faceParam)
+ if err != nil {
+ logger.Error("浜鸿劯搴忓垪鍖栭敊璇�", err)
+ }
+ TrackPond[msg.Cid].FaceN = 5
+ logger.Info("===================杩借釜涓�斾汉鑴哥殑涓暟", len(faceParam.Faces))
} else {
- TrackPond[msg.Cid] = &PersonTrack{Face:len(faceParam.Faces)}
+ if TrackPond[msg.Cid] != nil {
+ if TrackPond[msg.Cid].FaceN > 0 {
+ TrackPond[msg.Cid].FaceN--
+ faceParam.Faces = (faceParam.Faces)[0:0]
+ sdkinfo.Sdkdata, err = proto.Marshal(&faceParam)
+ if err != nil {
+ logger.Error("浜鸿劯搴忓垪鍖栭敊璇�", err)
+ }
+ TrackPond[msg.Cid].YoloN = 3
+ logger.Info("姝ゆ椂瀹归敊鍊间负锛�",TrackPond[msg.Cid].FaceN)
+ }
+ if TrackPond[msg.Cid].FaceN == 0 { //姝ゆ椂杩炵画浜旀涓嶅
+ TrackPond[msg.Cid].Face = len(faceParam.Faces)
+ TrackPond[msg.Cid].FaceN = 3
+ }
+ } else {
+ TrackPond[msg.Cid] = &PersonTrack{Face: len(faceParam.Faces),FaceN:3}
+ }
}
- //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++
- // }
- //}
} else {
continue
}
@@ -55,12 +69,38 @@
logger.Info("瑙ｆ瀽yolo鏁版嵁鏃跺嚭鐜伴敊璇�", err)
continue
}
- logger.Info("================杩借釜涔嬪墠yolo鐨勪釜鏁帮細",len(yoloParam.Infos))
- if yoloParam.Infos != nil && TrackPond[msg.Cid] != nil && len(yoloParam.Infos) == TrackPond[msg.Cid].Yolo { // yolo鐨勫鏋滄暟閲忕浉鍚屽垯瑙嗕负涓嶅彉銆佹妸yolo鐨剆dkData娓呯┖
+ var yoloNum int = 0
+ for i := 0; i < len(yoloParam.Infos); i++ {
+ if yoloParam.Infos[i].Typ == 0 {
+ yoloNum++
+ }
+ }
+ 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]
- logger.Info("===================杩借釜涓�攜olo鐨勪釜鏁�",len(yoloParam.Faces))
+ sdkinfo.Sdkdata, err = proto.Marshal(&yoloParam)
+ if err != nil {
+ logger.Error("yolo搴忓垪鍖栭敊璇�", err)
+ }
} else {
- TrackPond[msg.Cid] = &PersonTrack{Yolo:len(yoloParam.Infos)}
+ if TrackPond[msg.Cid] != nil {
+ TrackPond[msg.Cid].Yolo = yoloNum
+ if TrackPond[msg.Cid].YoloN > 0 {
+ TrackPond[msg.Cid].YoloN--
+ yoloParam.Infos = (yoloParam.Infos)[0:0]
+ sdkinfo.Sdkdata, err = proto.Marshal(&yoloParam)
+ if err != nil {
+ logger.Error("yolo搴忓垪鍖栭敊璇�", err)
+ }
+ logger.Info("姝ゆ椂瀹归敊鍊间负锛�",TrackPond[msg.Cid].YoloN)
+ }
+ if TrackPond[msg.Cid].YoloN == 0 { //姝ゆ椂杩炵画浜旀涓嶅
+ TrackPond[msg.Cid].Yolo = yoloNum
+ TrackPond[msg.Cid].YoloN = 3
+ }
+ } else {
+ TrackPond[msg.Cid] = &PersonTrack{Yolo: yoloNum,YoloN:3}
+ }
}
} else {
continue
@@ -69,6 +109,7 @@
}
logger.Debug("---------------------------------------杩借釜缁撴潫--------------------------------------")
}
+
//// 鍒ゆ柇涓�涓汉鑴竔d鍦ㄤ笉鍦ㄨ拷韪睜涓�
//func FaceIsInPond(cameraId string,face *protomsg.ResultFaceDetect) bool{
// if TrackPond[cameraId].Face > 0 {
@@ -93,4 +134,4 @@
// return false
// }
// return false
-//}
\ No newline at end of file
+//}
--
Gitblit v1.8.0