From 41461b1a2d1204c207b44de9c397d16af780104f Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期三, 17 七月 2019 18:02:37 +0800
Subject: [PATCH] 过滤一下yolo
---
main.go | 4 +++-
ruleserver/personTrack.go | 12 +++++++++---
2 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/main.go b/main.go
index c536279..0fc6c26 100644
--- a/main.go
+++ b/main.go
@@ -142,14 +142,16 @@
logger.Info("瑙ｆ瀽YOLO sdk鏁版嵁鏃跺嚭鐜伴敊璇�", err)
continue
}
- logger.Info("--------------杩借釜涔嬪悗yolo鐨勪釜鏁帮細",len(yoloParam.Infos))
+ var yoloNum int = 0
for _, info := range yoloParam.Infos {
if info.Typ == 0 {
//logger.Debug("-------------yolo鐨勫潗鏍囨湁鍑犱釜",info.RcObj)
photoMap := ruleserver.PhotoMap{Rects: rectFormat(info.RcObj), Score: float64(info.Prob)*100,IsYolo:true}
arg.Photo = append(arg.Photo, photoMap)
+ yoloNum++
}
}
+ logger.Info("--------------杩借釜涔嬪悗yolo鐨勪釜鏁帮細",len(yoloParam.Infos))
args.Sdkdata = append(args.Sdkdata,&arg)
} else {
continue
diff --git a/ruleserver/personTrack.go b/ruleserver/personTrack.go
index 38c08e0..8e5b2af 100644
--- a/ruleserver/personTrack.go
+++ b/ruleserver/personTrack.go
@@ -59,15 +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]
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