From d438f3354d9cd815be17753bfaf4f729501374e4 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期三, 24 七月 2019 18:42:32 +0800
Subject: [PATCH] ---
---
ruleserver/personTrack.go | 94 ++++++++++++++++++++++++++--------------------
1 files changed, 53 insertions(+), 41 deletions(-)
diff --git a/ruleserver/personTrack.go b/ruleserver/personTrack.go
index 8ffd0ad..3d036f8 100644
--- a/ruleserver/personTrack.go
+++ b/ruleserver/personTrack.go
@@ -9,48 +9,48 @@
var TrackPond = make(map[string]*PersonTrack)
type PersonTrack struct {
- Face int // 浜鸿劯鐨刬d鏁扮粍 鏀逛负鏁伴噺
- Yolo int // yolo瀵硅薄鐨刬d鏁扮粍 鏀逛负鏁伴噺
+ Face int // 浜鸿劯鐨刬d鏁扮粍 鏀逛负鏁伴噺
+ Yolo int // yolo瀵硅薄鐨刬d鏁扮粍 鏀逛负鏁伴噺
}
-func (pt *PersonTrack) Set(msg protomsg.SdkMessage) {
-
-}
-
-// 妫�鏌ユ槸鍚﹀墠鍚庝袱娆＄殑鏁版嵁id鏄惁瀹屽叏鐩稿悓锛堜汉鑴稿拰yolo锛�
+// 妫�鏌ユ槸鍚﹀墠鍚庝袱娆＄殑鏁版嵁id鏄惁瀹屽叏鐩稿悓锛堜汉鑴稿拰yolo锛� 鏀逛负鐩存帴妫�鏌ユ暟閲忔槸鍚︿竴鑷�
func IsSame(msg *protomsg.SdkMessage) {
- logger.Debug("++++++++++++++++++++++++++++杩借釜寮�濮�+++++++++++++++++++++鎽勫儚鏈篿d涓猴細",msg.Cid)
+ logger.Debug("+++++++++++++++++++++杩借釜寮�濮�+++++++++++++++鎽勫儚鏈篿d涓猴細",msg.Cid)
+ logger.Debug("---------------------缂撳瓨姹�--------------------------锛�",TrackPond)
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].Yolo { // 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 == "FaceDetect" { // 浜鸿劯妫�娴�
+ if len(sdkinfo.Sdkdata) > 1 {
+ faceParam := protomsg.ParamFacePos{}
+ err := proto.Unmarshal(sdkinfo.Sdkdata, &faceParam)
+ if err != nil {
+ logger.Info("瑙ｆ瀽face sdk鏁版嵁鏃跺嚭鐜伴敊璇�", err)
+ continue
+ }
+ if TrackPond[msg.Cid] != nil {
+ logger.Info("================杩借釜涔嬪墠浜鸿劯鐨勪釜鏁帮細",len(faceParam.Faces),"鐜板湪缂撳瓨姹犱腑璁板綍鐨勪釜鏁帮細",TrackPond[msg.Cid].Face)
+ } else {
+ 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 {
+ logger.Info("鏇存柊褰撳墠鎽勫儚鏈虹紦瀛樻睜涓殑浜鸿劯涓暟锛�",len(faceParam.Faces))
+ TrackPond[msg.Cid].Face = len(faceParam.Faces)
+ } else {
+ logger.Info("鏂板缓褰撳墠鎽勫儚鏈虹紦瀛樻睜涓殑浜鸿劯涓暟锛�",len(faceParam.Faces))
+ TrackPond[msg.Cid] = &PersonTrack{Face:len(faceParam.Faces)}
+ }
+ }
+ } else {
+ continue
+ }
+ }
if sdkinfo.Sdktype == "Yolo" {
if len(sdkinfo.Sdkdata) > 1 {
yoloParam := protomsg.ParamYoloObj{}
@@ -65,15 +65,26 @@
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 {
- TrackPond[msg.Cid] = &PersonTrack{Yolo:yoloNum}
+ if TrackPond[msg.Cid] != nil {
+ logger.Info("鏇存柊褰撳墠鎽勫儚鏈虹紦瀛樻睜涓殑yolo涓暟锛�",yoloNum)
+ TrackPond[msg.Cid].Yolo = yoloNum
+ } else {
+ logger.Info("鏂板缓褰撳墠鎽勫儚鏈虹紦瀛樻睜涓殑yolo涓暟锛�",yoloNum)
+ TrackPond[msg.Cid] = &PersonTrack{Yolo:yoloNum}
+ }
}
} else {
continue
@@ -82,6 +93,7 @@
}
logger.Debug("---------------------------------------杩借釜缁撴潫--------------------------------------")
}
+
//// 鍒ゆ柇涓�涓汉鑴竔d鍦ㄤ笉鍦ㄨ拷韪睜涓�
//func FaceIsInPond(cameraId string,face *protomsg.ResultFaceDetect) bool{
// if TrackPond[cameraId].Face > 0 {
@@ -106,4 +118,4 @@
// return false
// }
// return false
-//}
\ No newline at end of file
+//}
--
Gitblit v1.8.0