From 725d54ef5f16ede9c39cb003ed9d474edf02c0e5 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期五, 30 八月 2019 13:58:25 +0800
Subject: [PATCH] add facedetect grpc
---
service/FaceSdkService.go | 69 ++++++++++++++++++++++++++--------
1 files changed, 52 insertions(+), 17 deletions(-)
diff --git a/service/FaceSdkService.go b/service/FaceSdkService.go
index 0ac4063..9547060 100644
--- a/service/FaceSdkService.go
+++ b/service/FaceSdkService.go
@@ -8,9 +8,11 @@
"github.com/pkg/errors"
"github.com/satori/go.uuid"
"gocv.io/x/gocv"
+ "image"
"sync"
"time"
"webserver/extend/logger"
+ "webserver/extend/util"
)
type FaceSdkService struct {
@@ -32,24 +34,45 @@
)
func GetFaceFeaFromSdk(fileBytes []byte,deadTime time.Duration) ([]*protomsg.ResultFaceDetect,error,*protomsg.Image){
+ t1 := time.Now()
s := NewFaceSdkService(fileBytes, deadTime)
i, err := s.ReadFromUploadImg()
+ logger.Debug("ReadFromUploadImg鐢ㄦ椂:", time.Since(t1))
+ t1 = time.Now()
if err !=nil{
logger.Debug("readFromUploadImg err:",err)
return nil,err,i
}
- bc, err := ImgCompress(i)
+ imgBytes, err := proto.Marshal(i)
if err !=nil {
- logger.Debug("ImgCompress err:",err)
+ logger.Debug("i marshal err:",err)
return nil,err,i
}
- s.PushImgMsg(bc)
- s.GetFaceFea()
- if s.Result == nil{
- return nil,errors.New("no fea"),i
+ detectResults, err := DoFDetectWithRpc(&protomsg.FaceDetectRequest{ReqParam: imgBytes}, deadTime)
+ if err !=nil {
+ logger.Debug("DoFDetectWithRpc err:",err)
+ return nil,err,i
} else {
- return s.Result,nil,i
+ return detectResults,nil,i
}
+
+ //bc, err := ImgCompress(i)
+ //logger.Debug("ImgCompress鐢ㄦ椂:", time.Since(t1))
+ //t1 = time.Now()
+ //if err !=nil {
+ // logger.Debug("ImgCompress err:",err)
+ // return nil,err,i
+ //}
+ //s.PushImgMsg(bc)
+ //logger.Debug("PushImgMsg鐢ㄦ椂:", time.Since(t1))
+ //t1 = time.Now()
+ //s.GetFaceFea()
+ //logger.Debug("GetFaceFea鐢ㄦ椂:", time.Since(t1))
+ //if s.Result == nil{
+ // return nil,errors.New("no fea"),i
+ //} else {
+ // return s.Result,nil,i
+ //}
}
func NewFaceSdkService(fileBytes []byte, deadTime time.Duration) FaceSdkService{
@@ -81,19 +104,27 @@
}
func (s *FaceSdkService) ReadFromUploadImg() (*protomsg.Image,error){
- //defer (*(s.File)).Close()
- //imgB, err := ioutil.ReadAll(*(s.File))
- //if err !=nil{
- // logger.Debug("File.Read err:",err)
- // return nil,err
- //}
-
picMat, err := gocv.IMDecode(s.File, gocv.IMReadColor)
if err !=nil {
logger.Debug("gocv.IMDecode err:",err)
return nil,err
}
+ logger.Debug("picMat.Data.len:", len(picMat.ToBytes()))
+ newMat := gocv.NewMat()
+ size := 1024
+ if picMat.Rows() > size || picMat.Cols() > size {
+ fx := float64(size)/float64(picMat.Rows())
+ fy := float64(size)/float64(picMat.Cols())
+ ff := fx
+ if fx > fy{
+ ff = fy
+ }
+ gocv.Resize(picMat,&newMat, image.Pt(0,0), ff, ff, gocv.InterpolationDefault)
+ picMat = newMat
+ }
+
defer picMat.Close()
+
if picMat.Empty() {
logger.Debug("file not exist")
return nil,errors.New("picMat is empty")
@@ -213,7 +244,7 @@
return coms,ok
}
-func (f *FeaResult) Delete(id string){
+func (f *FeaResult) Delete(id int64){
f.Lock.Lock()
defer f.Lock.Unlock()
delete(f.FaceM,id)
@@ -260,9 +291,13 @@
}
rMsg := protomsg.SdkMessage{}
if err := proto.Unmarshal(resultBytes, &rMsg); err == nil {
- logger.Debug("received MSG:", rMsg.Cid)
i := protomsg.Image{}
- err := proto.Unmarshal(rMsg.Data, &i)
+ bdata, err := util.UnCompress(rMsg.Data)
+ if err !=nil {
+ logger.Debug("uncompress err:",err)
+ continue
+ }
+ err = proto.Unmarshal(bdata, &i)
if err !=nil {
continue
}
--
Gitblit v1.8.0