From d8d2bc7b4cf8e4a1f2b2a325d2ca02f0eb409d9c Mon Sep 17 00:00:00 2001
From: zhangmeng <zhangmeng@aiotlink.com>
Date: 星期四, 19 十二月 2019 16:25:24 +0800
Subject: [PATCH] up
---
work/sdk/humantrack.go | 114 +++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 79 insertions(+), 35 deletions(-)
diff --git a/work/sdk/humantrack.go b/work/sdk/humantrack.go
index b5ccc61..46ad033 100644
--- a/work/sdk/humantrack.go
+++ b/work/sdk/humantrack.go
@@ -1,6 +1,7 @@
package sdk
import (
+ "analysis/goconv"
"analysis/logo"
"analysis/work"
"context"
@@ -13,6 +14,13 @@
"basic.com/valib/gogpu.git"
)
+type imageWithID struct {
+ img *gohumantrack.ImageHumanTracker
+ fx float64
+ fy float64
+ id string
+}
+
// HumanTracker track
type HumanTracker struct {
tracker *gohumantrack.HumanTracker
@@ -24,7 +32,7 @@
mapCameraImageIndex map[string]int
recvImageCount int
index int
- images []*gohumantrack.ImageHumanTracker
+ images []*imageWithID
msgs []*work.MsgRS
}
@@ -36,10 +44,11 @@
flag: flag,
list: NewLockList(6),
- recvImageCount: 0,
- index: 0,
- images: make([]*gohumantrack.ImageHumanTracker, batchSize),
- msgs: make([]*work.MsgRS, batchSize),
+ recvImageCount: 0,
+ index: 0,
+ mapCameraImageIndex: make(map[string]int),
+ images: make([]*imageWithID, batchSize),
+ msgs: make([]*work.MsgRS, batchSize),
}
}
@@ -52,10 +61,7 @@
// Init impl
func (t *HumanTracker) Init() bool {
- if t.batchSize != 1 {
- logo.Errorln("ONLY SUPPORT BATCH SIZE = 1")
- return false
- }
+
gpu := t.gpu
if gpu == -1 {
@@ -94,7 +100,7 @@
return
}
- hr := convert2ProtoHumanTrackResult(res)
+ hr := convert2ProtoHumanTrackResult(res[0])
result := protomsg.HumanTrackResult{Result: hr}
data, err := proto.Marshal(&result)
if err != nil {
@@ -106,7 +112,7 @@
if rMsg.Msg.Tasklab != nil {
id, name = rMsg.Msg.Tasklab.Taskid, rMsg.Msg.Tasklab.Taskname
}
- logo.Infoln("CAMERAID: ", rMsg.Msg.Cid, " TASKID: ", id, " TASKNAME: ", name, " Human Track COUNT: ", len(hr[0]))
+ logo.Infoln("CAMERAID: ", rMsg.Msg.Cid, " TASKID: ", id, " TASKNAME: ", name, " Human Track COUNT: ", len(hr))
}
@@ -119,47 +125,62 @@
imgW, imgH := int(i.Width), int(i.Height)
+ var imgData []byte
+ rw, rh := 1280, 720
+ fx, fy := 1.0, 1.0
+ if imgW != rw || imgH != rh {
+ imgData = goconv.ResizeBGR(i.Data, imgW, imgH, rw, rh)
+ fx = (float64)(rw) / (float64)(imgW)
+ fy = (float64)(rh) / (float64)(imgH)
+ }
img := gohumantrack.ImageHumanTracker{
- Data: i.Data,
- Width: imgW,
- Height: imgH,
+ Data: imgData,
+ Width: rw,
+ Height: rh,
Channel: 3,
}
// mapCameraImageIndex map[string]int
// images []gohumantrack.ImageHumanTracker
- t.recvImageCount++
- if t.mapCameraImageIndex == nil {
- t.mapCameraImageIndex = make(map[string]int)
- for i := 0; i < t.batchSize; i++ {
- t.images[i] = nil
- }
- for i := 0; i < t.batchSize; i++ {
- t.msgs[i] = nil
- }
- }
if i, ok := t.mapCameraImageIndex[rMsg.Msg.Cid]; ok {
- if i < batchSize {
- t.images[i] = &img
+ if i < t.batchSize {
+ t.images[i] = &imageWithID{&img, fx, fy, rMsg.Msg.Cid}
t.msgs[i] = &rMsg
}
} else {
- if t.index < batchSize {
- t.images[t.index] = &img
+ if t.index < t.batchSize {
+ t.images[t.index] = &imageWithID{&img, fx, fy, rMsg.Msg.Cid}
t.msgs[t.index] = &rMsg
t.mapCameraImageIndex[rMsg.Msg.Cid] = t.index
}
t.index++
}
+ t.recvImageCount++
+
if t.recvImageCount < t.batchSize+t.batchSize/2 {
return
}
- res, err := t.tracker.ProcessImagePointer(t.images[:])
+ for k, v := range t.mapCameraImageIndex {
+ logo.Infoln("batch~~~~~~Map index: ", v, " camera: ", k)
+ }
+
+ var pimg []*gohumantrack.ImageHumanTracker
+ for k, v := range t.images[:] {
+ if v != nil {
+ pimg = append(pimg, v.img)
+ logo.Infoln("batch~~~~~~Image index: ", k, " camera: ", v.id, " image address: ", v.img)
+ } else {
+ pimg = append(pimg, nil)
+ }
+ }
+
+ res, err := t.tracker.ProcessImagePointer(pimg, rw, rh, 3)
+ t.recvImageCount = 0
if err != nil {
- t.mapCameraImageIndex = nil
+ logo.Infoln("batch~~~~~~Track Image Count: ", t.index, " Failed: ", err)
ejectResult(nil, rMsg, out)
return
}
@@ -168,11 +189,11 @@
if t.images[i] == nil {
continue
}
- hr := convert2ProtoHumanTrackResult(res[i])
+ hr := convert2ProtoHumanTrackResultWithScale(res[i], t.images[i].fx, t.images[i].fy)
result := protomsg.HumanTrackResult{Result: hr}
data, err := proto.Marshal(&result)
if err != nil {
- logo.Errorln("HUMAN TRACKER MARSHAL PROTO PLATE IDS ERROR", err)
+ logo.Errorln("batch~~~~~~HUMAN TRACKER MARSHAL PROTO PLATE IDS ERROR", err)
data = nil
}
msg := *t.msgs[i]
@@ -181,7 +202,7 @@
if msg.Msg.Tasklab != nil {
id, name = msg.Msg.Tasklab.Taskid, msg.Msg.Tasklab.Taskname
}
- logo.Infoln("CAMERAID: ", msg.Msg.Cid, " TASKID: ", id, " TASKNAME: ", name, " Human Track COUNT: ", len(hr[0]))
+ logo.Infoln("batch~~~~~~CAMERAID: ", msg.Msg.Cid, " TASKID: ", id, " TASKNAME: ", name, " Human Track COUNT: ", len(hr))
}
@@ -208,8 +229,8 @@
func convert2ProtoHumanTrackResult(obj gohumantrack.FgResult) []*protomsg.HumanTrack {
res := []*protomsg.HumanTrack{}
- for i := 0; i < int(v.FgNum); i++ {
- r := v.Fginfo[i]
+ for i := 0; i < int(obj.FgNum); i++ {
+ r := obj.Fginfo[i]
rect := protomsg.Rect{
Left: r.Left,
Right: r.Right,
@@ -228,3 +249,26 @@
}
return res
}
+
+func convert2ProtoHumanTrackResultWithScale(obj gohumantrack.FgResult, fx, fy float64) []*protomsg.HumanTrack {
+ res := []*protomsg.HumanTrack{}
+ for i := 0; i < int(obj.FgNum); i++ {
+ r := obj.Fginfo[i]
+ rect := protomsg.Rect{
+ Left: (int32)((float64)(r.Left) / fx),
+ Right: (int32)((float64)(r.Right) / fy),
+ Top: (int32)((float64)(r.Top) / fx),
+ Bottom: (int32)((float64)(r.Bottom) / fy),
+ }
+ pr := &protomsg.HumanTrack{
+ RcHuman: &rect,
+ Confidence: r.Confidence,
+ X: (int32)((float64)(r.X) / fx),
+ Y: (int32)((float64)(r.Y) / fy),
+ Id: r.ID,
+ Feature: r.Feature[:],
+ }
+ res = append(res, pr)
+ }
+ return res
+}
--
Gitblit v1.8.0