From c6a9f0ac501db824a3e1187d8eb661e7ac98b366 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期一, 29 七月 2019 15:24:55 +0800
Subject: [PATCH] ---
---
ruleserver/personTrack.go | 116 ++++++++++++++++++++++++++++++---------------------------
1 files changed, 61 insertions(+), 55 deletions(-)
diff --git a/ruleserver/personTrack.go b/ruleserver/personTrack.go
index e69173b..48199f4 100644
--- a/ruleserver/personTrack.go
+++ b/ruleserver/personTrack.go
@@ -44,51 +44,51 @@
}
}
}
- if sdkinfo.Sdktype == "Yolo" {
- if len(sdkinfo.Sdkdata) > 1 {
- yoloParam := protomsg.ParamYoloObj{}
- err := proto.Unmarshal(sdkinfo.Sdkdata, &yoloParam)
- if err != nil {
- logger.Info("瑙ｆ瀽yolo鏁版嵁鏃跺嚭鐜伴敊璇�", err)
- continue
- }
- var yoloNum int = 0
- for i := 0; i < len(yoloParam.Infos); i++ {
- if yoloParam.Infos[i].Typ == 0 {
- 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)
- if err != nil {
- logger.Error("yolo搴忓垪鍖栭敊璇�", err)
- }
- logger.Info("璺熶箣鍓嶇浉鍚岋紝娓呯┖yolo鏁版嵁")
- } else {
- if TrackPond[msg.Cid] != nil {
- logger.Info("鏇存柊褰撳墠鎽勫儚鏈虹紦瀛樻睜涓殑yolo涓暟锛�", yoloNum)
- TrackPond[msg.Cid].Yolo = yoloNum
- } else {
- logger.Info("鏂板缓褰撳墠鎽勫儚鏈虹紦瀛樻睜涓殑yolo涓暟锛�", yoloNum)
- TrackPond[msg.Cid] = &PersonTrack{Yolo: yoloNum}
- }
- }
- } else {
- if TrackPond[msg.Cid] != nil {
- TrackPond[msg.Cid].Yolo = 0
- } else {
- TrackPond[msg.Cid] = &PersonTrack{Yolo: 0}
- }
- logger.Info("鎽勫儚鏈�:" + msg.Cid + "-娌℃湁yolo锛岃閲嶇疆涓�0")
- continue
- }
- }
+ //if sdkinfo.Sdktype == "Yolo" {
+ // if len(sdkinfo.Sdkdata) > 1 {
+ // yoloParam := protomsg.ParamYoloObj{}
+ // err := proto.Unmarshal(sdkinfo.Sdkdata, &yoloParam)
+ // if err != nil {
+ // logger.Info("瑙ｆ瀽yolo鏁版嵁鏃跺嚭鐜伴敊璇�", err)
+ // continue
+ // }
+ // var yoloNum int = 0
+ // for i := 0; i < len(yoloParam.Infos); i++ {
+ // if yoloParam.Infos[i].Typ == 0 {
+ // 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)
+ // if err != nil {
+ // logger.Error("yolo搴忓垪鍖栭敊璇�", err)
+ // }
+ // logger.Info("璺熶箣鍓嶇浉鍚岋紝娓呯┖yolo鏁版嵁")
+ // } else {
+ // if TrackPond[msg.Cid] != nil {
+ // logger.Info("鏇存柊褰撳墠鎽勫儚鏈虹紦瀛樻睜涓殑yolo涓暟锛�", yoloNum)
+ // TrackPond[msg.Cid].Yolo = yoloNum
+ // } else {
+ // logger.Info("鏂板缓褰撳墠鎽勫儚鏈虹紦瀛樻睜涓殑yolo涓暟锛�", yoloNum)
+ // TrackPond[msg.Cid] = &PersonTrack{Yolo: yoloNum}
+ // }
+ // }
+ // } else {
+ // if TrackPond[msg.Cid] != nil {
+ // TrackPond[msg.Cid].Yolo = 0
+ // } else {
+ // TrackPond[msg.Cid] = &PersonTrack{Yolo: 0}
+ // }
+ // logger.Info("鎽勫儚鏈�:" + msg.Cid + "-娌℃湁yolo锛岃閲嶇疆涓�0")
+ // continue
+ // }
+ //}
}
logger.Debug("---------------------------------------杩借釜缁撴潫--------------------------------------")
}
@@ -107,16 +107,16 @@
for i := 0; i < len(faceParam.Faces); {
faceFlag := false
for _, val := range TrackPond[cameraId].Faces {
- //if faceParam.Faces[i].Pos.FaceID == val.Id && faceParam.Faces[i].Pos.FAngle.Confidence <= val.Score { // 鍦ㄦ睜瀛愰噷骞朵笖鍒嗗�兼洿浣庯紝鏄鎶涘純鐨勬暟鎹�
- // faceFlag = true
- // //return "true"
- // faceParam.Faces = append(faceParam.Faces[:i], faceParam.Faces[i+1:]...)
- // logger.Info("姝ゆ暟鎹敱浜庡湪姹犲瓙涓笖鍒嗗�兼洿浣庯紝鏄琚姏寮冪殑鏁版嵁")
- // break
- //}
- if faceParam.Faces[i].Pos.FaceID == val.Id && faceParam.Faces[i].Pos.FAngle.Confidence <= val.Score { // 鍦ㄦ睜瀛愰噷骞朵笖鍒嗗�兼洿楂橈紝鏇存柊缂撳瓨
+ 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, "姝ゆ暟鎹敱浜庡湪姹犲瓙涓笖鍒嗗�兼洿浣庯紝鏄琚紶閫掍笅鍘荤殑鏁版嵁")
+ //return "true"
+ logger.Info("鍒嗗�间负锛�",faceParam.Faces[i].Pos.FAngle.Confidence,"--缂撳瓨鐨勫垎鍊间负锛�",val.Score,"姝ゆ暟鎹敱浜庡湪姹犲瓙涓笖鍒嗗�兼洿浣庯紝鏄琚姏寮冪殑鏁版嵁")
+ faceParam.Faces = append(faceParam.Faces[:i], faceParam.Faces[i+1:]...)
+ break
+ }
+ 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
}
}
@@ -126,7 +126,13 @@
i++
}
}
- // 鍙嶅悜寰幆 锛岀湅閭ｄ簺缂撳瓨鏈夎�屾暟鎹病鏈夌殑
+ logger.Info("鍙嶅簭鍒楀寲閲嶆柊瑁呴厤涔嬪墠浜鸿劯鐨勪釜鏁帮細",len(faceParam.Faces))
+ sdkinfor.Sdkdata, err = proto.Marshal(&faceParam)
+ if err != nil {
+ logger.Error("yolo搴忓垪鍖栭敊璇�", err)
+ }
+ logger.Info("璺熶箣鍓嶇浉鍚岋紝娓呯┖yolo鏁版嵁")
+ // 鍙嶅悜寰幆 锛岀湅閭ｄ簺缂撳瓨鏈夎�屾暟鎹病鏈夌殑灏卞垹闄ゆ暟鎹洿鏂扮紦瀛�
for i := 0; i < len(TrackPond[cameraId].Faces); {
flag := false
for _, temp := range facesTemp {
--
Gitblit v1.8.0