From ebe954dab1f8a58d86a0282960591acb05cee479 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期五, 05 七月 2019 19:15:04 +0800
Subject: [PATCH] fix bug
---
service/FaceSdkService.go | 139 ++++++++++++++++++++++++++--------------------
1 files changed, 79 insertions(+), 60 deletions(-)
diff --git a/service/FaceSdkService.go b/service/FaceSdkService.go
index 4749496..8275437 100644
--- a/service/FaceSdkService.go
+++ b/service/FaceSdkService.go
@@ -3,21 +3,18 @@
import (
"basic.com/pubsub/protomsg.git"
"basic.com/valib/deliver.git"
- "encoding/base64"
"fmt"
"github.com/gogo/protobuf/proto"
"github.com/pierrec/lz4"
"github.com/pkg/errors"
"github.com/satori/go.uuid"
"gocv.io/x/gocv"
- "io/ioutil"
- "mime/multipart"
"sync"
"time"
)
type FaceSdkService struct {
- File *multipart.File
+ File []byte
Id string
Result []*protomsg.ResultFaceExtCom
}
@@ -32,9 +29,9 @@
Url_Service_PULL = Ipc_Url_Pre + Virtual_FaceSdkId + Ipc_Pull_Ext
)
-func NewFaceSdkService(file multipart.File) FaceSdkService{
+func NewFaceSdkService(fileBytes []byte) FaceSdkService{
return FaceSdkService{
- File:&file,
+ File:fileBytes,
Id:uuid.NewV4().String(),
}
}
@@ -60,16 +57,14 @@
}
func (s *FaceSdkService) ReadFromUploadImg() (*protomsg.Image,error){
- defer (*(s.File)).Close()
- imgB, err := ioutil.ReadAll(*(s.File))
- if err !=nil{
- fmt.Println("File.Read err:",err)
- return nil,err
- }
+ //defer (*(s.File)).Close()
+ //imgB, err := ioutil.ReadAll(*(s.File))
+ //if err !=nil{
+ // fmt.Println("File.Read err:",err)
+ // return nil,err
+ //}
- fmt.Println("imgB.len:",len(imgB))
-
- picMat, err := gocv.IMDecode(imgB, gocv.IMReadColor)
+ picMat, err := gocv.IMDecode(s.File, gocv.IMReadColor)
if err !=nil {
fmt.Println("gocv.IMDecode err:",err)
return nil,err
@@ -81,7 +76,7 @@
}
height := int32(picMat.Rows())
width := int32(picMat.Cols())
- //data := picMat.ToBytes()
+ data := picMat.ToBytes()
timeUnix := time.Now().Unix()
formatTimeStr := time.Unix(timeUnix, 0).Format("2006-01-02 15:04:05")
@@ -89,7 +84,7 @@
Width: width,
Height: height,
Timestamp: formatTimeStr,
- Data: imgB,
+ Data: data,
Id: timeUnix,
Cid:s.Id,
},nil
@@ -119,29 +114,24 @@
func (s *FaceSdkService) GetFaceFea(){
var wg sync.WaitGroup
wg.Add(1)
+ ticker := time.NewTicker(time.Second * 3)
+ go func(ticker *time.Ticker, s *FaceSdkService) {
+ defer ticker.Stop()
+ defer wg.Done()
- go func() {
- Exit:
for {
select {
- case <-time.Tick(time.Second*2):
- fmt.Println("鍊掕鏃剁粨鏉�")
- wg.Done()
- break Exit
+ case <-ticker.C:
+ return
default:
- if feas,ok := resultMap[s.Id];ok {
- fmt.Println("faceFea got!!!")
+ if feas,ok := resultMap.Get(s.Id);ok {
s.Result = feas
- break Exit
- } else {
- fmt.Println("灏氭湭鎷垮埌fea")
+ return
}
}
}
- }()
- fmt.Println("wa.Wait")
+ }(ticker, s)
wg.Wait()
- fmt.Println("<-ch")
}
func readTestImgFile() protomsg.Image{
@@ -181,14 +171,36 @@
imgPushChan <- is
}
-var resultMap map[string][]*protomsg.ResultFaceExtCom
+type FeaResult struct {
+ FeaM map[string][]*protomsg.ResultFaceExtCom
+ Lock sync.Mutex
+}
+
+func (f *FeaResult) Write(id string,faceResult []*protomsg.ResultFaceExtCom){
+ f.Lock.Lock()
+ defer f.Lock.Unlock()
+ f.FeaM[id] = faceResult
+}
+
+func (f *FeaResult) Get(id string) ([]*protomsg.ResultFaceExtCom,bool){
+ f.Lock.Lock()
+ defer f.Lock.Unlock()
+ coms,ok := f.FeaM[id]
+ return coms,ok
+}
+
+func (f *FeaResult) Delete(id string){
+ f.Lock.Lock()
+ defer f.Lock.Unlock()
+ delete(f.FeaM,id)
+}
+
+var resultMap = FeaResult{}
func InitService() {
fmt.Println("service init!")
imgPushChan = make(chan []byte)
-
- resultMap = make(map[string][]*protomsg.ResultFaceExtCom,0)
-
+ resultMap.FeaM = make(map[string][]*protomsg.ResultFaceExtCom,0)
client_push = deliver.NewClient(deliver.PushPull, Url_Service_PUSH)
client_pull = deliver.NewClient(deliver.PushPull, Url_Service_PULL)
defer func() {
@@ -231,36 +243,43 @@
fmt.Println("Len(sdkInfos)=",len(sdkInfos))
for _,swt :=range sdkInfos{
- if swt.Sdktype =="FaceDetect"{
- fmt.Println("浜鸿劯妫�娴嬬粨鏋�")
- var pfp protomsg.ParamFacePos
- err := proto.Unmarshal(swt.Sdkdata, &pfp)
- if err !=nil {
- fmt.Println("faceDetect result unmarshal err:",err)
- } else {
- for _,face :=range pfp.Faces{
- fmt.Println("FacePos:",face.Pos)
- fmt.Println("ThftResult:",face.Result)
- }
- }
- }
+ //浜鸿劯妫�娴嬬殑缁撴灉
+ //if swt.Sdktype =="FaceDetect"{
+ // fmt.Println("浜鸿劯妫�娴嬬粨鏋滈暱搴︼細",len(swt.Sdkdata))
+ // if len(swt.Sdkdata)>1{
+ // var pfp protomsg.ParamFacePos
+ // err := proto.Unmarshal(swt.Sdkdata, &pfp)
+ // if err !=nil {
+ // fmt.Println("faceDetect result unmarshal err:",err)
+ // } else {
+ // for _,face :=range pfp.Faces{
+ // fmt.Println("FacePos:",face.Pos)
+ // fmt.Println("ThftResult:",face.Result)
+ // }
+ // }
+ // }
+ //}
+ //浜鸿劯鎻愬彇鐨勭粨鏋�
if swt.Sdktype == "FaceExtract"{
- var pff protomsg.ParamFaceFeature
- if err := proto.Unmarshal(swt.Sdkdata, &pff);err !=nil{
- //fmt.Println("ParamFaceFeature unmarshal err:",err)
- } else {
- fmt.Println("鐩爣鏁帮細",len(pff.ExtComp))
- if len(pff.ExtComp) >0 {
- resultMap[rMsg.Cid] = pff.ExtComp
+ fmt.Println("浜鸿劯鎻愬彇缁撴灉闀垮害:",len(swt.Sdkdata))
+ if len(swt.Sdkdata) > 1{
+ var pff protomsg.ParamFaceFeature
+ if err := proto.Unmarshal(swt.Sdkdata, &pff);err !=nil{
+ //fmt.Println("ParamFaceFeature unmarshal err:",err)
+ } else {
+ fmt.Println("鐩爣鏁帮細",len(pff.ExtComp))
+ if len(pff.ExtComp) >0 {
+ resultMap.Write(perId,pff.ExtComp)
- for _,fea :=range pff.ExtComp{
- base64Fea := base64.StdEncoding.EncodeToString(fea.Feats)
- fmt.Println("perId:",perId)
- fmt.Println("faceFeature:",base64Fea)
+ //for _,fea :=range pff.ExtComp{
+ // base64Fea := base64.StdEncoding.EncodeToString(fea.Feats)
+ // fmt.Println("perId:",perId)
+ // fmt.Println("faceFeature:",base64Fea)
+ //}
}
}
+ break
}
- break
}
}
}
--
Gitblit v1.8.0