From 4e7e3aa3cdfe45c0cb06509ed11330bf9e7019b8 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期一, 22 七月 2019 10:48:19 +0800
Subject: [PATCH] 更正追踪人脸数量错误
---
ruleserver/personTrack.go | 109 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 109 insertions(+), 0 deletions(-)
diff --git a/ruleserver/personTrack.go b/ruleserver/personTrack.go
new file mode 100644
index 0000000..449abcb
--- /dev/null
+++ b/ruleserver/personTrack.go
@@ -0,0 +1,109 @@
+package ruleserver
+
+import (
+ "basic.com/pubsub/protomsg.git"
+ "github.com/golang/protobuf/proto"
+ "ruleprocess/logger"
+)
+
+var TrackPond = make(map[string]*PersonTrack)
+
+type PersonTrack struct {
+ Face int // 浜鸿劯鐨刬d鏁扮粍 鏀逛负鏁伴噺
+ Yolo int // yolo瀵硅薄鐨刬d鏁扮粍 鏀逛负鏁伴噺
+}
+
+func (pt *PersonTrack) Set(msg protomsg.SdkMessage) {
+
+}
+
+// 妫�鏌ユ槸鍚﹀墠鍚庝袱娆＄殑鏁版嵁id鏄惁瀹屽叏鐩稿悓锛堜汉鑴稿拰yolo锛�
+func IsSame(msg *protomsg.SdkMessage) {
+ logger.Debug("++++++++++++++++++++++++++++杩借釜寮�濮�+++++++++++++++++++++鎽勫儚鏈篿d涓猴細",msg.Cid)
+ 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 {
+ TrackPond[msg.Cid] = &PersonTrack{Face:len(faceParam.Faces)}
+ }
+ //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
+ }
+ }
+ if sdkinfo.Sdktype == "Yolo" {
+ if len(sdkinfo.Sdkdata) > 1 {
+ yoloParam := protomsg.ParamYoloObj{}
+ err := proto.Unmarshal(sdkinfo.Sdkdata, &yoloParam)
+ if err != nil {
+ logger.Info("瑙ｆ瀽yolo鏁版嵁鏃跺嚭鐜伴敊璇�", err)
+ continue
+ }
+ 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]
+ sdkinfo.Sdkdata,err = proto.Marshal(&yoloParam)
+ if err != nil {
+ logger.Error("yolo搴忓垪鍖栭敊璇�",err)
+ }
+ } else {
+ TrackPond[msg.Cid] = &PersonTrack{Yolo:yoloNum}
+ }
+ } else {
+ continue
+ }
+ }
+ }
+ 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
+//}
\ No newline at end of file
--
Gitblit v1.8.0