From bcebdcfdc1a41422bf1b6a35c5bfacfb22e5b420 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期三, 17 七月 2019 17:11:26 +0800
Subject: [PATCH] 加入人脸追踪[C
---
go.sum | 2
go.mod | 2
main.go | 8 +-
ruleserver/personTrack.go | 94 +++++++++++++++++++++++++++++++
ruleserver/readyDataForRule.go | 16 +++--
5 files changed, 111 insertions(+), 11 deletions(-)
diff --git a/go.mod b/go.mod
index 5f24da0..e66c9e0 100644
--- a/go.mod
+++ b/go.mod
@@ -5,7 +5,7 @@
require (
basic.com/dbapi.git v0.0.0-20190701055817-73bca225181f
basic.com/pubsub/cache.git v0.0.0-20190712095028-e73efb4afc3b
- basic.com/pubsub/protomsg.git v0.0.0-20190712081201-5a482419c227
+ basic.com/pubsub/protomsg.git v0.0.0-20190717072554-576620e5ba07
basic.com/pubsub/sdkcompare.git v0.0.0-20190715013640-f536a4647d00
basic.com/valib/deliver.git v0.0.0-20190531095353-25d8c3b20051
basic.com/valib/gopherdiscovery.git v0.0.0-20190605034340-15d89d8b4e28
diff --git a/go.sum b/go.sum
index 277e93e..be748aa 100644
--- a/go.sum
+++ b/go.sum
@@ -6,6 +6,8 @@
basic.com/pubsub/protomsg.git v0.0.0-20190709070734-b34c868adcc2/go.mod h1:un5NV5VWQoblVLZfx1Rt5vyLgwR0jI92d3VJhfrJhWU=
basic.com/pubsub/protomsg.git v0.0.0-20190712081201-5a482419c227 h1:1jprxyxmeQ8X4/S7cFnhRf4ByVqD0xLZNvx8/0xTk2k=
basic.com/pubsub/protomsg.git v0.0.0-20190712081201-5a482419c227/go.mod h1:un5NV5VWQoblVLZfx1Rt5vyLgwR0jI92d3VJhfrJhWU=
+basic.com/pubsub/protomsg.git v0.0.0-20190717072554-576620e5ba07 h1:ZeiaQTNSB6K5ASpcwYtk0bWabMQX0r2JX/5agzTznRs=
+basic.com/pubsub/protomsg.git v0.0.0-20190717072554-576620e5ba07/go.mod h1:un5NV5VWQoblVLZfx1Rt5vyLgwR0jI92d3VJhfrJhWU=
basic.com/pubsub/sdkcompare.git v0.0.0-20190715013640-f536a4647d00 h1:sK+Tx7rvM9J2WnNIwrzMDjZSylWiKNfQO0prUBfKsDk=
basic.com/pubsub/sdkcompare.git v0.0.0-20190715013640-f536a4647d00/go.mod h1:8by33F9E1w17Pw/rDgJGJXAo122w0wDENG14hiMS+RE=
basic.com/valib/deliver.git v0.0.0-20190531095353-25d8c3b20051 h1:9flC2o3kasaM2Y6I+mY+mxmve/pyAY/UzGQZLT3lFHM=
diff --git a/main.go b/main.go
index e433cbc..c536279 100644
--- a/main.go
+++ b/main.go
@@ -105,6 +105,8 @@
if err != nil {
panic("瑙ｆ瀽msg鏃跺嚭鐜伴敊璇�")
}
+ // 鍏堣繘琛屼竴涓嬭拷韪�
+ ruleserver.IsSame(&m)
args.CameraId = m.Cid
args.TaskId = m.Tasklab.Taskid
// 鎶婂浘鐗囩殑浜岃繘鍒惰В鍘嬬缉杩涜鐢绘鍦ㄥ帇缂╁洖鍘�
@@ -140,7 +142,7 @@
logger.Info("瑙ｆ瀽YOLO sdk鏁版嵁鏃跺嚭鐜伴敊璇�", err)
continue
}
- //logger.Info("--------------鐪嬬湅yolo涓湁鍑犱釜鐩爣锛�",len(yoloParam.Infos))
+ logger.Info("--------------杩借釜涔嬪悗yolo鐨勪釜鏁帮細",len(yoloParam.Infos))
for _, info := range yoloParam.Infos {
if info.Typ == 0 {
//logger.Debug("-------------yolo鐨勫潗鏍囨湁鍑犱釜",info.RcObj)
@@ -177,9 +179,9 @@
logger.Info("瑙ｆ瀽FACE sdk鏁版嵁鏃跺嚭鐜伴敊璇�", err)
continue
}
- logger.Info("--------------鐪嬬湅浜鸿劯妫�娴嬩腑鏈夊嚑涓洰鏍囷細",len(faceParam.Faces))
+ logger.Info("--------------杩借釜涔嬪悗yolo鐨勪釜鏁帮細",len(faceParam.Faces))
for _, info := range faceParam.Faces {
- logger.Info("_______________________________________________绗竴娆＄湅鐩镐技鍊硷細",info.Pos.FAngle.Confidence*100)
+ //logger.Info("_______________________________________________绗竴娆＄湅鐩镐技鍊硷細",info.Pos.FAngle.Confidence*100)
photoMap := ruleserver.PhotoMap{Rects: rectFormat(info.Pos.RcFace), Score: float64(info.Pos.FAngle.Confidence*100), IsYolo:false,ThftRes:*(info.Result),Feature:info.Feats}
arg.Photo = append(arg.Photo, photoMap)
}
diff --git a/ruleserver/personTrack.go b/ruleserver/personTrack.go
new file mode 100644
index 0000000..a819dda
--- /dev/null
+++ b/ruleserver/personTrack.go
@@ -0,0 +1,94 @@
+package ruleserver
+
+import (
+ "basic.com/pubsub/protomsg.git"
+ "github.com/golang/protobuf/proto"
+ "ruleprocess/logger"
+)
+
+var TrackPond = make(map[string]*PersonTrack)
+
+type PersonTrack struct {
+ Face int // 浜鸿劯鐨刬d鏁扮粍 鏀逛负鏁伴噺
+ Yolo int // yolo瀵硅薄鐨刬d鏁扮粍 鏀逛负鏁伴噺
+}
+
+func (pt *PersonTrack) Set(msg protomsg.SdkMessage) {
+
+}
+
+// 妫�鏌ユ槸鍚﹀墠鍚庝袱娆＄殑鏁版嵁id鏄惁瀹屽叏鐩稿悓锛堜汉鑴稿拰yolo锛�
+func IsSame(msg *protomsg.SdkMessage) {
+ logger.Debug("++++++++++++++++++++++++++++杩借釜寮�濮�++++++++++++++++++++++++")
+ for _, sdkinfo := range msg.Tasklab.Sdkinfos { // 閬嶅巻鍚勭畻娉曠殑sdkData
+ if sdkinfo.Sdktype == "FaceDetect" { // 浜鸿劯妫�娴�
+ if len(sdkinfo.Sdkdata) > 1 {
+ faceParam := protomsg.ParamFacePos{}
+ err := proto.Unmarshal(sdkinfo.Sdkdata, &faceParam)
+ if err != nil {
+ logger.Info("瑙ｆ瀽face sdk鏁版嵁鏃跺嚭鐜伴敊璇�", err)
+ continue
+ }
+ logger.Info("================杩借釜涔嬪墠浜鸿劯鐨勪釜鏁帮細",len(faceParam.Faces))
+ if len(faceParam.Faces) == TrackPond[msg.Cid].Yolo { // yolo鐨勫鏋滄暟閲忕浉鍚屽垯瑙嗕负涓嶅彉銆佹妸yolo鐨剆dkData娓呯┖
+ faceParam.Faces = (faceParam.Faces)[0:0]
+ } else {
+ TrackPond[msg.Cid].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
+ }
+ }
+ 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
+ }
+ logger.Info("================杩借釜涔嬪墠yolo鐨勪釜鏁帮細",len(yoloParam.Infos))
+ if len(yoloParam.Infos) == TrackPond[msg.Cid].Yolo { // yolo鐨勫鏋滄暟閲忕浉鍚屽垯瑙嗕负涓嶅彉銆佹妸yolo鐨剆dkData娓呯┖
+ yoloParam.Infos = (yoloParam.Infos)[0:0]
+ } else {
+ TrackPond[msg.Cid].Yolo = len(yoloParam.Infos)
+ }
+ } else {
+ continue
+ }
+ }
+ }
+ logger.Debug("---------------------------------------杩借釜缁撴潫--------------------------------------")
+}
+//// 鍒ゆ柇涓�涓汉鑴竔d鍦ㄤ笉鍦ㄨ拷韪睜涓�
+//func FaceIsInPond(cameraId string,face *protomsg.ResultFaceDetect) bool{
+// if TrackPond[cameraId].Face > 0 {
+// for key,val := range TrackPond {
+// if key == cameraId {
+// faceFlag := false
+// for faceId := range val.Face {
+// if face.Pos.FaceID == uint64(faceId) { // 姝や汉鑴稿凡鍦ㄦ睜瀛愪腑锛屼笉闇�瑕佸畠鍒颁笅涓�涓幆鑺備簡
+// faceFlag = true
+// return true
+// }
+// }
+// if !faceFlag { // 姝や汉鑴镐笉鍦ㄦ睜瀛愪腑
+// val.Face = append(val.Face,face.Pos.FaceID)
+// return false
+// }
+// }else {
+// return false
+// }
+// }
+// } else {
+// return false
+// }
+// return false
+//}
\ No newline at end of file
diff --git a/ruleserver/readyDataForRule.go b/ruleserver/readyDataForRule.go
index 7bdbaa5..100ba1e 100644
--- a/ruleserver/readyDataForRule.go
+++ b/ruleserver/readyDataForRule.go
@@ -132,13 +132,15 @@
}
logger.Info("------------------------------------------------------------------------------------------------------------------------")
logger.Info("=====================浜哄憳id鐨勯泦鍚堜负锛�",ids)
- baseinfos, err1 := esutil.Dbpersoninfosbyid(ids)
- if err1 != nil {
- logger.Error("鏌ヨ搴曞簱浜哄憳淇℃伅鍑洪敊", err1)
- }
- logger.Debug("----------------++++++++++++++++++++搴曞簱浜哄憳淇℃伅锛�",baseinfos)
- for _,baseinfo := range baseinfos {
- logger.Info("---------鐪嬬湅姣忎釜搴曞簱浜哄憳鐨勪俊鎭細",baseinfo)
+ if len(ids) > 0 {
+ baseinfos, err1 := esutil.Dbpersoninfosbyid(ids)
+ if err1 != nil {
+ logger.Error("鏌ヨ搴曞簱浜哄憳淇℃伅鍑洪敊", err1)
+ }
+ logger.Debug("----------------++++++++++++++++++++搴曞簱浜哄憳淇℃伅锛�",baseinfos)
+ for _,baseinfo := range baseinfos {
+ logger.Info("---------鐪嬬湅姣忎釜搴曞簱浜哄憳鐨勪俊鎭細",baseinfo)
+ }
}
//baseinfo.CompareScore = Retain(val)
//arg.Liker = append(arg.Liker, &baseinfo)
--
Gitblit v1.8.0