From ae314c05124c9d23b906a6675120870d3d709a7e Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期三, 24 七月 2019 10:49:28 +0800
Subject: [PATCH] 还原追踪，用容错就没有数据了
---
ruleserver/personTrack.go | 72 ++++++++++++++---------------------
1 files changed, 29 insertions(+), 43 deletions(-)
diff --git a/ruleserver/personTrack.go b/ruleserver/personTrack.go
index e0917a2..e1ba6c1 100644
--- a/ruleserver/personTrack.go
+++ b/ruleserver/personTrack.go
@@ -10,15 +10,13 @@
type PersonTrack struct {
Face int // 浜鸿劯鐨刬d鏁扮粍 鏀逛负鏁伴噺
- FaceN int // 娣诲姞瀹归敊锛屽垵濮嬪�间负5锛岃繛缁�5娆′笉瀵规墠绠椾笉瀵�
Yolo int // yolo瀵硅薄鐨刬d鏁扮粍 鏀逛负鏁伴噺
- YoloN int // 娣诲姞瀹归敊锛屽垵濮嬪�间负5锛岃繛缁�5娆′笉瀵规墠绠椾笉瀵�
}
// 妫�鏌ユ槸鍚﹀墠鍚庝袱娆＄殑鏁版嵁id鏄惁瀹屽叏鐩稿悓锛堜汉鑴稿拰yolo锛� 鏀逛负鐩存帴妫�鏌ユ暟閲忔槸鍚︿竴鑷�
func IsSame(msg *protomsg.SdkMessage) {
- logger.Debug("+++++++++++++++++++++杩借釜寮�濮�+++++++++++++++鎽勫儚鏈篿d涓猴細", msg.Cid)
- logger.Debug("---------------------缂撳瓨姹�--------------------------锛�", TrackPond)
+ logger.Debug("+++++++++++++++++++++杩借釜寮�濮�+++++++++++++++鎽勫儚鏈篿d涓猴細",msg.Cid)
+ logger.Debug("---------------------缂撳瓨姹�--------------------------锛�",TrackPond)
for _, sdkinfo := range msg.Tasklab.Sdkinfos { // 閬嶅巻鍚勭畻娉曠殑sdkData
if sdkinfo.Sdktype == "FaceDetect" { // 浜鸿劯妫�娴�
if len(sdkinfo.Sdkdata) > 1 {
@@ -28,34 +26,32 @@
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娓呯┖
+ 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)
+ sdkinfo.Sdkdata,err = proto.Marshal(&faceParam)
if err != nil {
- logger.Error("浜鸿劯搴忓垪鍖栭敊璇�", err)
+ logger.Error("浜鸿劯搴忓垪鍖栭敊璇�",err)
}
- TrackPond[msg.Cid].FaceN = 2
- logger.Info("===================杩借釜涓�斾汉鑴哥殑涓暟", len(faceParam.Faces))
+ logger.Info("===================杩借釜涓�斾汉鑴哥殑涓暟",len(faceParam.Faces))
} else {
if TrackPond[msg.Cid] != nil {
- if TrackPond[msg.Cid].FaceN > 0 {
- TrackPond[msg.Cid].FaceN--
- faceParam.Faces = (faceParam.Faces)[0:0]
- sdkinfo.Sdkdata, err = proto.Marshal(&faceParam)
- if err != nil {
- logger.Error("浜鸿劯搴忓垪鍖栭敊璇�", err)
- }
- logger.Info("姝ゆ椂瀹归敊鍊间负锛�",TrackPond[msg.Cid].FaceN)
- }
- if TrackPond[msg.Cid].FaceN == 0 { //姝ゆ椂杩炵画浜旀涓嶅
- TrackPond[msg.Cid].Face = len(faceParam.Faces)
- TrackPond[msg.Cid].FaceN = 2
- }
+ TrackPond[msg.Cid].Face = len(faceParam.Faces)
} else {
- TrackPond[msg.Cid] = &PersonTrack{Face: len(faceParam.Faces),FaceN:2}
+ 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
}
@@ -69,37 +65,27 @@
continue
}
var yoloNum int = 0
- for i := 0; i < len(yoloParam.Infos); i++ {
+ for i := 0;i < len(yoloParam.Infos); i++ {
if yoloParam.Infos[i].Typ == 0 {
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)
+ sdkinfo.Sdkdata,err = proto.Marshal(&yoloParam)
if err != nil {
- logger.Error("yolo搴忓垪鍖栭敊璇�", err)
+ logger.Error("yolo搴忓垪鍖栭敊璇�",err)
}
- TrackPond[msg.Cid].YoloN = 2
} else {
if TrackPond[msg.Cid] != nil {
TrackPond[msg.Cid].Yolo = yoloNum
- if TrackPond[msg.Cid].YoloN > 0 {
- TrackPond[msg.Cid].YoloN--
- yoloParam.Infos = (yoloParam.Infos)[0:0]
- sdkinfo.Sdkdata, err = proto.Marshal(&yoloParam)
- if err != nil {
- logger.Error("yolo搴忓垪鍖栭敊璇�", err)
- }
- logger.Info("姝ゆ椂瀹归敊鍊间负锛�",TrackPond[msg.Cid].YoloN)
- }
- if TrackPond[msg.Cid].YoloN == 0 { //姝ゆ椂杩炵画浜旀涓嶅
- TrackPond[msg.Cid].Yolo = yoloNum
- TrackPond[msg.Cid].YoloN = 2
- }
} else {
- TrackPond[msg.Cid] = &PersonTrack{Yolo: yoloNum,YoloN:2}
+ TrackPond[msg.Cid] = &PersonTrack{Yolo:yoloNum}
}
}
} else {
--
Gitblit v1.8.0