From bb215e57c6a8ae527820697b59cec900d4d3fdfe Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期六, 27 七月 2019 11:25:18 +0800
Subject: [PATCH] 追踪
---
ruleserver/personTrack.go | 132 ++++++++++++++++++++++---------------------
1 files changed, 68 insertions(+), 64 deletions(-)
diff --git a/ruleserver/personTrack.go b/ruleserver/personTrack.go
index 342b02a..341aa45 100644
--- a/ruleserver/personTrack.go
+++ b/ruleserver/personTrack.go
@@ -19,76 +19,80 @@
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)
+ 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 {
+ TrackPond[msg.Cid].Face = 0
+ logger.Info("娌℃湁浜鸿劯锛岃閲嶇疆涓�0")
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{}
- err := proto.Unmarshal(sdkinfo.Sdkdata, &yoloParam)
- if err != nil {
- logger.Info("瑙ｆ瀽yolo鏁版嵁鏃跺嚭鐜伴敊璇�", err)
+ 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++
+ }
+ }
+ 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
+ } else {
+ logger.Info("鏂板缓褰撳墠鎽勫儚鏈虹紦瀛樻睜涓殑yolo涓暟锛�", yoloNum)
+ TrackPond[msg.Cid] = &PersonTrack{Yolo: yoloNum}
+ }
+ }
+ } else {
+ TrackPond[msg.Cid].Yolo = 0
+ logger.Info("娌℃湁yolo锛岃閲嶇疆涓�0")
continue
}
- var yoloNum int = 0
- for i := 0; i < len(yoloParam.Infos); i++ {
- if yoloParam.Infos[i].Typ == 0 {
- 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
- } else {
- logger.Info("鏂板缓褰撳墠鎽勫儚鏈虹紦瀛樻睜涓殑yolo涓暟锛�", yoloNum)
- TrackPond[msg.Cid] = &PersonTrack{Yolo: yoloNum}
- }
- }
- //} else {
- // continue
- //}
}
}
logger.Debug("---------------------------------------杩借釜缁撴潫--------------------------------------")
--
Gitblit v1.8.0