From a6cecf4a41eaf57b71247121f7e53529cb85683b Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期二, 19 十一月 2019 17:47:47 +0800
Subject: [PATCH] ---
---
ruleserver/personTrack.go | 54 +++++++++++++++++++++++-------------------------------
1 files changed, 23 insertions(+), 31 deletions(-)
diff --git a/ruleserver/personTrack.go b/ruleserver/personTrack.go
index 7abe6fe..e6d1c1c 100644
--- a/ruleserver/personTrack.go
+++ b/ruleserver/personTrack.go
@@ -2,8 +2,8 @@
import (
"basic.com/pubsub/protomsg.git"
- "ruleprocess/logger"
"github.com/golang/protobuf/proto"
+ "basic.com/valib/logger.git"
"ruleprocess/structure"
"sync"
)
@@ -12,10 +12,10 @@
var lock = sync.RWMutex{}
type PersonTrack struct {
- Faces []*Face // 浜鸿劯鐨勬暟缁� 鏀逛负鏁伴噺
+ Objs []*Obj // 浜鸿劯鐨勬暟缁�
Yolo int // yolo瀵硅薄鐨刬d鏁扮粍 鏀逛负鏁伴噺
}
-type Face struct {
+type Obj struct {
Id uint64
Score float32
}
@@ -27,7 +27,6 @@
logger.Debug("+++++++++++++++++++++浜鸿劯杩借釜寮�濮�+++++++++++++++鎽勫儚鏈篿d涓猴細", msg.Cid, "---缂撳瓨姹犱负锛�", TrackPond)
for _, sdkinfo := range msg.Tasklab.Sdkinfos { // 閬嶅巻鍚勭畻娉曠殑sdkData
if sdkinfo.Sdktype == "FaceDetect" { // 浜鸿劯妫�娴�
- logger.Info("鏁版嵁闀垮害涓猴細", len(sdkinfo.Sdkdata))
if len(sdkinfo.Sdkdata) > 1 {
num = 25
FaceIsInPond(msg.Cid, sdkinfo)
@@ -39,11 +38,11 @@
if TrackPond[msg.Cid] != nil {
logger.Info("濡傛灉涓嶄负绌猴細", TrackPond[msg.Cid])
lock.Lock()
- TrackPond[msg.Cid].Faces = nil
+ TrackPond[msg.Cid].Objs = nil
lock.Unlock()
} else {
lock.Lock()
- TrackPond[msg.Cid] = &PersonTrack{Faces: nil}
+ TrackPond[msg.Cid] = &PersonTrack{Objs: nil}
lock.Unlock()
logger.Info("濡傛灉涓虹┖锛�", TrackPond[msg.Cid])
}
@@ -57,7 +56,7 @@
}
// 杩借釜浜轰綋锛屾鏌ユ暟閲忔槸鍚︿竴鑷�
-func BodyIsSame(msg *protomsg.SdkMessage) bool {
+func BodyIsSame(args *structure.SdkDatas,msg *protomsg.SdkMessage) bool{
logger.Debug("+++++++++++++++++++++浜轰綋杩借釜寮�濮�+++++++++++++++鎽勫儚鏈篿d涓猴細", msg.Cid, "---缂撳瓨姹犱负锛�", TrackPond)
for _, sdkinfo := range msg.Tasklab.Sdkinfos { // 閬嶅巻鍚勭畻娉曠殑sdkData
if sdkinfo.Sdktype == "Yolo" {
@@ -80,36 +79,30 @@
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鏁版嵁")
+ yoloParam.Infos = (yoloParam.Infos)[0:0]
+ sdkinfo.Sdkdata, err = proto.Marshal(&yoloParam)
+ if err != nil {
+ logger.Error("yolo搴忓垪鍖栭敊璇�", err)
+ }
+ delete(args.RuleResult,"yolo")
+ logger.Info("娓呴櫎yolo鏍囩锛�",args.RuleResult["yolo"])
+ logger.Info("璺熶箣鍓嶇浉鍚岋紝娓呯┖yolo鏁版嵁锛屼汉浣撹拷韪粨鏉�")
return true
} else {
if TrackPond[msg.Cid] != nil {
logger.Info("鏇存柊褰撳墠鎽勫儚鏈虹紦瀛樻睜涓殑yolo涓暟锛�", yoloNum)
- lock.Lock()
TrackPond[msg.Cid].Yolo = yoloNum
- lock.Unlock()
} else {
logger.Info("鏂板缓褰撳墠鎽勫儚鏈虹紦瀛樻睜涓殑yolo涓暟锛�", yoloNum)
- lock.Lock()
TrackPond[msg.Cid] = &PersonTrack{Yolo: yoloNum}
- lock.Unlock()
}
return false
}
} else {
if TrackPond[msg.Cid] != nil {
- lock.Lock()
TrackPond[msg.Cid].Yolo = 0
- lock.Unlock()
} else {
- lock.Lock()
TrackPond[msg.Cid] = &PersonTrack{Yolo: 0}
- lock.Unlock()
}
logger.Info("鎽勫儚鏈�:" + msg.Cid + "-娌℃湁yolo锛岃閲嶇疆涓�0")
continue
@@ -119,6 +112,7 @@
logger.Debug("---------------------------------浜轰綋杩借釜缁撴潫--------------------------------------")
return false
}
+
func TrackOrNot(label map[string]interface{}) bool {
if label["yolo"] != nil && len(label["yolo"].([]structure.Result)) > 0 {
for _, res := range label["yolo"].([]structure.Result) {
@@ -133,8 +127,8 @@
// 杩囨护鎺夐偅浜涘凡鍦ㄧ紦瀛樹腑涓斿垎鍊兼洿浣庣殑浜鸿劯锛屾洿鏂扮紦瀛橈紙娌℃湁鐨勫姞涓婏紝鍒嗗�兼洿鏂颁负鏇撮珮鐨勶紝澶氱殑鍒犻櫎锛�
func FaceIsInPond(cameraId string, sdkinfor *protomsg.SdkmsgWithTask) {
if TrackPond[cameraId] != nil {
- logger.Info("----椹墠鐐細", TrackPond[cameraId], "=====", len(TrackPond[cameraId].Faces))
- for _, face := range TrackPond[cameraId].Faces {
+ logger.Info("----椹墠鐐細", TrackPond[cameraId], "=====", len(TrackPond[cameraId].Objs))
+ for _, face := range TrackPond[cameraId].Objs {
logger.Info("缂撳瓨涓瓨鍌ㄧ殑face鏁版嵁锛�", face.Id, face.Score)
}
faceParam := protomsg.ParamFacePos{}
@@ -150,10 +144,9 @@
for _, face := range faceParam.Faces {
facesTemp = append(facesTemp, *face) // 鍏堟妸鏁版嵁杞瓨涓�浠斤紝涓嶇劧涓�浼氬効鏁版嵁鍒犲噺涔嬪悗鎵句笉鍒板師濮嬫暟鎹紝涓嶈兘璁╃紦瀛樻暟鎹洿鏂颁簡
}
-
for i := 0; i < len(faceParam.Faces); {
faceFlag := false
- for _, val := range TrackPond[cameraId].Faces {
+ for _, val := range TrackPond[cameraId].Objs {
if faceParam.Faces[i].Pos.FaceID == val.Id && faceParam.Faces[i].Pos.FAngle.Confidence <= val.Score { // 鍦ㄦ睜瀛愰噷骞朵笖鍒嗗�兼洿浣庯紝鏄鎶涘純鐨勬暟鎹�
faceFlag = true
//return "true"
@@ -171,12 +164,11 @@
}
if !faceFlag { // 姝や汉鑴镐笉鍦ㄦ睜瀛愪腑
logger.Info("姝や汉鑴镐笉鍦ㄦ睜瀛愪腑锛屽線姹犲瓙涓坊鍔犳暟鎹洿鏂扮紦瀛�")
- TrackPond[cameraId].Faces = append(TrackPond[cameraId].Faces, &Face{faceParam.Faces[i].Pos.FaceID, faceParam.Faces[i].Pos.FAngle.Confidence})
+ TrackPond[cameraId].Objs = append(TrackPond[cameraId].Objs, &Obj{faceParam.Faces[i].Pos.FaceID, faceParam.Faces[i].Pos.FAngle.Confidence})
i++
}
}
logger.Info("鍙嶅簭鍒楀寲閲嶆柊瑁呴厤涔嬪墠浜鸿劯鐨勪釜鏁帮細", len(faceParam.Faces))
-
logger.Info("涓存椂瀛樺偍鐨勬柊鏉ユ暟鎹細")
for _, temp := range facesTemp {
logger.Info("涓存椂瀛樺偍鐨勬柊鏉ョ殑鐨刦ace鏁版嵁锛�", temp.Pos.FaceID, temp.Pos.FAngle.Confidence)
@@ -186,10 +178,10 @@
logger.Error("浜鸿劯搴忓垪鍖栭敊璇�", err)
}
// 鍙嶅悜寰幆 锛岀湅閭ｄ簺缂撳瓨鏈夎�屾暟鎹病鏈夌殑灏卞垹闄ゆ暟鎹洿鏂扮紦瀛�
- for i := 0; i < len(TrackPond[cameraId].Faces); {
+ for i := 0; i < len(TrackPond[cameraId].Objs); {
flag := false
for _, temp := range facesTemp {
- if TrackPond[cameraId].Faces[i].Id == temp.Pos.FaceID {
+ if TrackPond[cameraId].Objs[i].Id == temp.Pos.FaceID {
flag = true
}
}
@@ -199,13 +191,13 @@
// 姝ゆ暟鎹湪缂撳瓨涓絾涓嶅湪鏉ョ殑鏁版嵁甯т腑锛屽垹闄ゆ鏁版嵁鏇存柊缂撳瓨
logger.Info("鍒犻櫎姹犲瓙涓殑鏁版嵁鏇存柊缂撳瓨")
lock.Lock()
- TrackPond[cameraId].Faces = append(TrackPond[cameraId].Faces[:i], TrackPond[cameraId].Faces[i+1:]...)
+ TrackPond[cameraId].Objs = append(TrackPond[cameraId].Objs[:i], TrackPond[cameraId].Objs[i+1:]...)
lock.Unlock()
}
}
} else {
lock.Lock()
- TrackPond[cameraId] = &PersonTrack{Faces: nil}
+ TrackPond[cameraId] = &PersonTrack{Objs: nil}
lock.Unlock()
}
}
--
Gitblit v1.8.0