From 5c570013536cad0a1a9c13661692403645c32df0 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期二, 06 八月 2019 14:57:14 +0800
Subject: [PATCH] rm ImgCompress
---
service/FaceSdkService.go | 35 ++++++++++++++++++++++-------------
1 files changed, 22 insertions(+), 13 deletions(-)
diff --git a/service/FaceSdkService.go b/service/FaceSdkService.go
index 43a4101..57ddf9f 100644
--- a/service/FaceSdkService.go
+++ b/service/FaceSdkService.go
@@ -8,6 +8,7 @@
"github.com/pkg/errors"
"github.com/satori/go.uuid"
"gocv.io/x/gocv"
+ "image"
"sync"
"time"
"webserver/extend/logger"
@@ -33,19 +34,28 @@
)
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)
- if err !=nil {
- logger.Debug("ImgCompress err:",err)
- return nil,err,i
- }
+ bc,_ := proto.Marshal(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 {
@@ -82,19 +92,19 @@
}
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
}
+ newMat := gocv.NewMat()
+ if picMat.Rows() > 1000 || picMat.Cols() > 1000 {
+ gocv.Resize(picMat,&newMat, image.Pt(0,0), 0.5, 0.5, gocv.InterpolationDefault)
+ picMat = newMat
+ }
+
defer picMat.Close()
+
if picMat.Empty() {
logger.Debug("file not exist")
return nil,errors.New("picMat is empty")
@@ -261,7 +271,6 @@
}
rMsg := protomsg.SdkMessage{}
if err := proto.Unmarshal(resultBytes, &rMsg); err == nil {
- logger.Debug("received MSG:", rMsg.Cid)
i := protomsg.Image{}
bdata, err := util.UnCompress(rMsg.Data)
if err !=nil {
--
Gitblit v1.8.0