From 28a612a9bb78fe20896dbf5075bcb4a60dedc6ca Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期一, 29 七月 2019 09:52:38 +0800
Subject: [PATCH] ---
---
ruleserver/personTrack.go | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/ruleserver/personTrack.go b/ruleserver/personTrack.go
index 2f4b186..3e83d8e 100644
--- a/ruleserver/personTrack.go
+++ b/ruleserver/personTrack.go
@@ -23,13 +23,16 @@
logger.Debug("---------------------缂撳瓨姹�--------------------------锛�", TrackPond)
for _, sdkinfo := range msg.Tasklab.Sdkinfos { // 閬嶅巻鍚勭畻娉曠殑sdkData
if sdkinfo.Sdktype == "FaceDetect" { // 浜鸿劯妫�娴�
+ logger.Info("鏁版嵁闀垮害涓猴細",len(sdkinfo.Sdkdata))
if len(sdkinfo.Sdkdata) > 1 {
FaceIsInPond(msg.Cid,sdkinfo)
} else {
if TrackPond[msg.Cid] != nil {
+ logger.Info("濡傛灉涓嶄负绌猴細",TrackPond[msg.Cid])
TrackPond[msg.Cid].Faces = nil
} else {
TrackPond[msg.Cid] = &PersonTrack{Faces: nil}
+ logger.Info("濡傛灉涓虹┖锛�",TrackPond[msg.Cid])
}
logger.Info("鎽勫儚鏈�:" + msg.Cid + "-娌℃湁浜鸿劯锛岃閲嶇疆涓虹┖")
continue
@@ -85,12 +88,19 @@
}
// 杩囨护鎺夐偅浜涘凡鍦ㄧ紦瀛樹腑涓斿垎鍊兼洿浣庣殑浜鸿劯锛屾洿鏂扮紦瀛橈紙娌℃湁鐨勫姞涓婏紝鍒嗗�兼洿鏂颁负鏇撮珮鐨勶紝澶氱殑鍒犻櫎锛�
-func FaceIsInPond(cameraId string, sdkinfo *protomsg.SdkmsgWithTask) string {
+func FaceIsInPond(cameraId string, sdkinfor *protomsg.SdkmsgWithTask) string {
+ logger.Info("浜鸿劯涓暟涓猴細",len(TrackPond[cameraId].Faces),"杩欎釜鎽勫儚鏈虹殑缂撳瓨绛変簬nil鍢涳紵",TrackPond[cameraId] == nil)
if TrackPond[cameraId] != nil && len(TrackPond[cameraId].Faces) > 0 {
+ logger.Info("----椹墠鐐細",TrackPond[cameraId],"=====",len(TrackPond[cameraId].Faces))
faceParam := protomsg.ParamFacePos{}
- err := proto.Unmarshal(sdkinfo.Sdkdata, &faceParam)
+ err := proto.Unmarshal(sdkinfor.Sdkdata, &faceParam)
if err != nil {
logger.Info("瑙ｆ瀽face sdk鏁版嵁鏃跺嚭鐜伴敊璇�", err)
+ }
+ if TrackPond[cameraId] != nil {
+ logger.Info("================杩借釜涔嬪墠浜鸿劯鐨勪釜鏁帮細", len(faceParam.Faces), "鐜板湪缂撳瓨姹犱腑璁板綍鐨勪釜鏁帮細", len(TrackPond[cameraId].Faces))
+ } else {
+ logger.Info("================杩借釜涔嬪墠浜鸿劯鐨勪釜鏁帮細", len(faceParam.Faces), "杩樻病鏈夎繖涓憚鍍忔満鐨勭紦瀛�")
}
var facesTemp = faceParam.Faces // 鍏堟妸鏁版嵁杞瓨涓�浠斤紝涓嶇劧涓�浼氬効鏁版嵁鍒犲噺涔嬪悗鎵句笉鍒板師濮嬫暟鎹紝涓嶈兘璁╃紦瀛樻暟鎹洿鏂颁簡
for i := 0 ;i < len(faceParam.Faces); {
@@ -104,6 +114,7 @@
}
if faceParam.Faces[i].Pos.FaceID == val.Id && faceParam.Faces[i].Pos.FAngle.Confidence <= val.Score{ // 鍦ㄦ睜瀛愰噷骞朵笖鍒嗗�兼洿楂橈紝鏇存柊缂撳瓨
faceFlag = true
+ logger.Info("鍒嗗�肩敱",val.Score,"鏇存柊涓猴細",faceParam.Faces[i].Pos.FAngle.Confidence)
val.Score = faceParam.Faces[i].Pos.FAngle.Confidence
}
}
--
Gitblit v1.8.0