From b624035a9b6bbcd0b9d11503aa0b00815c61f38a Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期四, 18 七月 2019 15:58:45 +0800
Subject: [PATCH] ---
---
ruleserver/personTrack.go | 23 ++++++++++++++++++-----
1 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/ruleserver/personTrack.go b/ruleserver/personTrack.go
index ac3a822..8e5b2af 100644
--- a/ruleserver/personTrack.go
+++ b/ruleserver/personTrack.go
@@ -19,7 +19,7 @@
// 妫�鏌ユ槸鍚﹀墠鍚庝袱娆＄殑鏁版嵁id鏄惁瀹屽叏鐩稿悓锛堜汉鑴稿拰yolo锛�
func IsSame(msg *protomsg.SdkMessage) {
- logger.Debug("++++++++++++++++++++++++++++杩借釜寮�濮�++++++++++++++++++++++++")
+ logger.Debug("++++++++++++++++++++++++++++杩借釜寮�濮�+++++++++++++++++++++鎽勫儚鏈篿d涓猴細",msg.Cid)
for _, sdkinfo := range msg.Tasklab.Sdkinfos { // 閬嶅巻鍚勭畻娉曠殑sdkData
if sdkinfo.Sdktype == "FaceDetect" { // 浜鸿劯妫�娴�
if len(sdkinfo.Sdkdata) > 1 {
@@ -32,6 +32,10 @@
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)}
@@ -55,12 +59,21 @@
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)}
+ TrackPond[msg.Cid] = &PersonTrack{Yolo:yoloNum}
}
} else {
continue
--
Gitblit v1.8.0