From 0981ad3f85d52550436f00ed3c7bd020f1f727b0 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期六, 29 六月 2019 15:55:50 +0800
Subject: [PATCH] test
---
service/FaceSdkService.go | 77 +++++++++++++++++++++-----------------
1 files changed, 42 insertions(+), 35 deletions(-)
diff --git a/service/FaceSdkService.go b/service/FaceSdkService.go
index 6008c1d..a062883 100644
--- a/service/FaceSdkService.go
+++ b/service/FaceSdkService.go
@@ -10,14 +10,12 @@
"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 +30,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 +58,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
@@ -194,6 +190,12 @@
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() {
@@ -243,35 +245,40 @@
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)
+ 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.Write(perId,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