From ab80a1fb4d519b46540eb23751fe3751219729e8 Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期四, 19 十二月 2019 15:41:20 +0800
Subject: [PATCH] add conv
---
work/sdk/humantrack.go | 22 +++++++++++++---------
1 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/work/sdk/humantrack.go b/work/sdk/humantrack.go
index b2b8d80..2700a05 100644
--- a/work/sdk/humantrack.go
+++ b/work/sdk/humantrack.go
@@ -29,7 +29,7 @@
mapCameraImageIndex map[string]int
recvImageCount int
index int
- images []imageWithID
+ images []*imageWithID
msgs []*work.MsgRS
}
@@ -44,7 +44,7 @@
recvImageCount: 0,
index: 0,
mapCameraImageIndex: make(map[string]int),
- images: make([]*gohumantrack.ImageHumanTracker, batchSize),
+ images: make([]*imageWithID, batchSize),
msgs: make([]*work.MsgRS, batchSize),
}
}
@@ -134,12 +134,12 @@
if i, ok := t.mapCameraImageIndex[rMsg.Msg.Cid]; ok {
if i < t.batchSize {
- t.images[i] = imageWithID{&img, rMsg.Msg.Cid}
+ t.images[i] = &imageWithID{&img, rMsg.Msg.Cid}
t.msgs[i] = &rMsg
}
} else {
if t.index < t.batchSize {
- t.images[t.index] = imageWithID{&img, rMsg.Msg.Cid}
+ t.images[t.index] = &imageWithID{&img, rMsg.Msg.Cid}
t.msgs[t.index] = &rMsg
t.mapCameraImageIndex[rMsg.Msg.Cid] = t.index
}
@@ -148,7 +148,6 @@
t.recvImageCount++
if t.recvImageCount < t.batchSize+t.batchSize/2 {
- logo.Infoln("batch~~~~~~Current Index: ", t.index)
return
}
@@ -157,15 +156,20 @@
}
var pimg []*gohumantrack.ImageHumanTracker
- for k, v := range t.images {
- pimg = append(v.img)
- logo.Infoln("batch~~~~~~Map index: ", k, " camera: ", v.id)
+ 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)
t.recvImageCount = 0
if err != nil {
- logo.Infoln("batch~~~~~~Track Failed: ", err)
+ logo.Infoln("batch~~~~~~Track Image Count: ", t.index, " Failed: ", err)
ejectResult(nil, rMsg, out)
return
}
--
Gitblit v1.8.0