From d3b3f6b835cb7fcbb3712f876e84c8ed625170a2 Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期三, 15 一月 2020 11:30:08 +0800
Subject: [PATCH] Merge branch 'cuda-8.0' of ssh://192.168.5.5:29418/libgowrapper/face into cuda-8.0
---
run.go | 87 +++++++++++++++++++------------------------
1 files changed, 39 insertions(+), 48 deletions(-)
diff --git a/run.go b/run.go
index 86cc73c..f01f979 100644
--- a/run.go
+++ b/run.go
@@ -2,16 +2,16 @@
import (
"context"
- "os"
"sync"
"time"
+ "unsafe"
"face/common"
+ "basic.com/pubsub/protomsg.git"
"basic.com/valib/gogpu.git"
+ "github.com/gogo/protobuf/proto"
)
-
-const maxTryBeforeReboot = 10
type face struct {
handle *SDKFace
@@ -30,40 +30,6 @@
ipc2Rule string
ruleMsgMaxCacheSize int
reserved map[string]interface{}
-
- running bool
- rebootUntil int
- mtxRunning sync.Mutex
-}
-
-func (f *face) maybeReboot(ctx context.Context) {
- for {
- select {
- case <-ctx.Done():
- return
- default:
- f.mtxRunning.Lock()
- running := f.running
- f.mtxRunning.Unlock()
-
- if running {
- f.rebootUntil = 0
-
- f.mtxRunning.Lock()
- f.running = false
- f.mtxRunning.Unlock()
-
- } else {
- f.rebootUntil++
- f.fnLogger("Face No Running: ", f.rebootUntil)
- if f.rebootUntil > maxTryBeforeReboot {
- f.fnLogger("Face Too Long Running, Reboot")
- os.Exit(0)
- }
- }
- time.Sleep(time.Second)
- }
- }
}
// Create create sdk
@@ -149,9 +115,6 @@
ipc2Rule: ipc2Rule,
ruleMsgMaxCacheSize: ruleMaxSize,
reserved: reserved,
-
- running: true,
- rebootUntil: maxTryBeforeReboot,
}
}
@@ -185,8 +148,6 @@
go torule.Run(ctx)
go s.run(ctx, chRcv, chSnd)
-
- go s.maybeReboot(ctx)
}
//////////////////////////////////////////////////////////////////
@@ -296,20 +257,50 @@
// conv to bgr24 and resize
imgW, imgH := int(i.Width), int(i.Height)
- f.fnLogger("Face Start Run:", dtchn, "CAMERAID: ", rMsg.Msg.Cid)
+ detect := f.handle.Track(i.Data, imgW, imgH, 3, dtchn)
- count, data, _ := f.handle.Run(i.Data, imgW, imgH, 3, dtchn)
+ var faces []*protomsg.ResultFaceDetect
+
+ //灏唖dk杩斿洖鍊艰浆鎹㈡垚protomsg绫诲瀷
+ for _, d := range detect {
+
+ //杩愯sd
+ dec := FaceInfo2FacePos(d)
+ prop := f.handle.Propertize(dec, i.Data, imgW, imgH, 3, dtchn)
+ feat := f.handle.Extract(dec, i.Data, imgW, imgH, 3, dtchn)
+
+ resP := (*protomsg.ThftResult)(unsafe.Pointer(&prop))
+
+ result := tconvert2ProtoFacePos(d)
+
+ //缁勬垚缁撴灉骞跺簭鍒楀寲
+ res := &protomsg.ResultFaceDetect{Pos: result, Result: resP, Feats: feat}
+ faces = append(faces, res)
+
+ }
+
+ var err error
+ var data []byte
+ if len(faces) > 0 {
+
+ // logo.Infoln("CID: ", rMsg.Msg.Cid, " TASK: ", rMsg.Msg.Tasklab.Taskid, " FACE TRACK OBJS: ", len(faces))
+
+ facePos := protomsg.ParamFacePos{Faces: faces}
+ data, err = proto.Marshal(&facePos)
+ if err != nil {
+ f.fnLogger("fdetect marshal proto face pos error", err)
+ data = nil
+ }
+ }
common.EjectResult(data, rMsg, out)
- f.mtxRunning.Lock()
- f.running = true
- f.mtxRunning.Unlock()
var id, name string
if rMsg.Msg.Tasklab != nil {
id, name = rMsg.Msg.Tasklab.Taskid, rMsg.Msg.Tasklab.Taskname
}
- f.fnLogger("Chan:", dtchn, "CAMERAID: ", rMsg.Msg.Cid, " TASKID: ", id, " TASKNAME: ", name, " DETECT ", f.typ, " COUNT: ", count)
+
+ f.fnLogger("Chan:", dtchn, "CAMERAID: ", rMsg.Msg.Cid, " TASKID: ", id, " TASKNAME: ", name, " DETECT ", f.typ, " COUNT: ", len(faces))
sc++
if sc == 25 {
--
Gitblit v1.8.0