From e383e503030119c870eb0bb5efe0a865124b9bcf Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期一, 22 七月 2019 15:48:22 +0800
Subject: [PATCH] ---
---
ruleserver/personTrack.go | 63 ++++++++++++++++---------------
1 files changed, 32 insertions(+), 31 deletions(-)
diff --git a/ruleserver/personTrack.go b/ruleserver/personTrack.go
index 8ffd0ad..45ab0f0 100644
--- a/ruleserver/personTrack.go
+++ b/ruleserver/personTrack.go
@@ -19,38 +19,39 @@
// 妫�鏌ユ槸鍚﹀墠鍚庝袱娆＄殑鏁版嵁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
+ }
+ 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{}
--
Gitblit v1.8.0