From 914cf7bf26c100b5af62c55b00c58884fee4cbd0 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期五, 26 七月 2019 20:50:45 +0800
Subject: [PATCH] add face-viturl-web-camid
---
service/FaceSdkService.go | 34 +++++++++++++++++++++-------------
1 files changed, 21 insertions(+), 13 deletions(-)
diff --git a/service/FaceSdkService.go b/service/FaceSdkService.go
index a3f0387..0ac4063 100644
--- a/service/FaceSdkService.go
+++ b/service/FaceSdkService.go
@@ -15,22 +15,24 @@
type FaceSdkService struct {
File []byte
- Id string
+ Id int64
Result []*protomsg.ResultFaceDetect
+ DeadTime time.Duration
}
const (
Ipc_Push_Ext = "_2.ipc"
Ipc_Pull_Ext = "_1.ipc"
Ipc_Url_Pre = "ipc:///tmp///"
+ faceExtractWebCID = "virtual-face-extract-web-camera-id"
Virtual_FaceTaskId = "92496BDF-2BFA-98F2-62E8-96DD9866ABD2"
Virtual_FaceSdkId = "virtual-faceextract-sdk-pull"
Url_Service_PUSH = Ipc_Url_Pre + Virtual_FaceSdkId + Ipc_Push_Ext
Url_Service_PULL = Ipc_Url_Pre + Virtual_FaceSdkId + Ipc_Pull_Ext
)
-func GetFaceFeaFromSdk(fileBytes []byte) ([]*protomsg.ResultFaceDetect,error,*protomsg.Image){
- s := NewFaceSdkService(fileBytes)
+func GetFaceFeaFromSdk(fileBytes []byte,deadTime time.Duration) ([]*protomsg.ResultFaceDetect,error,*protomsg.Image){
+ s := NewFaceSdkService(fileBytes, deadTime)
i, err := s.ReadFromUploadImg()
if err !=nil{
logger.Debug("readFromUploadImg err:",err)
@@ -50,10 +52,11 @@
}
}
-func NewFaceSdkService(fileBytes []byte) FaceSdkService{
+func NewFaceSdkService(fileBytes []byte, deadTime time.Duration) FaceSdkService{
return FaceSdkService{
File:fileBytes,
- Id:uuid.NewV4().String(),
+ Id:time.Now().UnixNano(),
+ DeadTime:deadTime,
}
}
@@ -106,8 +109,8 @@
Height: height,
Timestamp: formatTimeStr,
Data: data,
- Id: timeUnix,
- Cid:s.Id,
+ Id: s.Id,
+ Cid: faceExtractWebCID,
},nil
}
@@ -135,7 +138,7 @@
func (s *FaceSdkService) GetFaceFea(){
var wg sync.WaitGroup
wg.Add(1)
- ticker := time.NewTicker(time.Second * 3)
+ ticker := time.NewTicker(s.DeadTime)
go func(ticker *time.Ticker, s *FaceSdkService) {
defer ticker.Stop()
defer wg.Done()
@@ -193,17 +196,17 @@
}
type FeaResult struct {
- FaceM map[string][]*protomsg.ResultFaceDetect
+ FaceM map[int64][]*protomsg.ResultFaceDetect
Lock sync.Mutex
}
-func (f *FeaResult) Write(id string,faceDetectResult []*protomsg.ResultFaceDetect){
+func (f *FeaResult) Write(id int64,faceDetectResult []*protomsg.ResultFaceDetect){
f.Lock.Lock()
defer f.Lock.Unlock()
f.FaceM[id] = faceDetectResult
}
-func (f *FeaResult) Get(id string) ([]*protomsg.ResultFaceDetect,bool){
+func (f *FeaResult) Get(id int64) ([]*protomsg.ResultFaceDetect,bool){
f.Lock.Lock()
defer f.Lock.Unlock()
coms,ok := f.FaceM[id]
@@ -221,7 +224,7 @@
func InitService() {
logger.Debug("service init!")
imgPushChan = make(chan []byte)
- resultMap.FaceM = make(map[string][]*protomsg.ResultFaceDetect,0)
+ resultMap.FaceM = make(map[int64][]*protomsg.ResultFaceDetect,0)
client_push = deliver.NewClient(deliver.PushPull, Url_Service_PUSH)
client_pull = deliver.NewClient(deliver.PushPull, Url_Service_PULL)
defer func() {
@@ -258,7 +261,12 @@
rMsg := protomsg.SdkMessage{}
if err := proto.Unmarshal(resultBytes, &rMsg); err == nil {
logger.Debug("received MSG:", rMsg.Cid)
- perId := rMsg.Cid //鏁版嵁id
+ i := protomsg.Image{}
+ err := proto.Unmarshal(rMsg.Data, &i)
+ if err !=nil {
+ continue
+ }
+ perId := i.Id //鏁版嵁id
if rMsg.Tasklab != nil && rMsg.Tasklab.Taskid == Virtual_FaceTaskId {
sdkInfos := rMsg.Tasklab.Sdkinfos
--
Gitblit v1.8.0