From 2f2078090cfd091bd718ecd63e078cb01b968c93 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期二, 06 八月 2019 15:15:09 +0800
Subject: [PATCH] add ImgCompress
---
service/FaceSdkService.go | 28 +++++++++-------------------
1 files changed, 9 insertions(+), 19 deletions(-)
diff --git a/service/FaceSdkService.go b/service/FaceSdkService.go
index 5cfa375..d140ff3 100644
--- a/service/FaceSdkService.go
+++ b/service/FaceSdkService.go
@@ -34,23 +34,25 @@
)
func GetFaceFeaFromSdk(fileBytes []byte,deadTime time.Duration) ([]*protomsg.ResultFaceDetect,error,*protomsg.Image){
- tStart :=time.Now()
+ t1 := time.Now()
s := NewFaceSdkService(fileBytes, deadTime)
i, err := s.ReadFromUploadImg()
- logger.Debug("ReadFromUploadImg鐢ㄦ椂锛�", time.Since(tStart))
+ logger.Debug("ReadFromUploadImg鐢ㄦ椂:", time.Since(t1))
+ t1 = time.Now()
if err !=nil{
logger.Debug("readFromUploadImg err:",err)
return nil,err,i
}
- tStart = time.Now()
bc, err := ImgCompress(i)
- logger.Debug("ImgCompress鐢ㄦ椂锛�", time.Since(tStart))
+ logger.Debug("ImgCompress鐢ㄦ椂:", time.Since(t1))
+ t1 = time.Now()
if err !=nil {
logger.Debug("ImgCompress err:",err)
return nil,err,i
}
s.PushImgMsg(bc)
- t1 := time.Now()
+ logger.Debug("PushImgMsg鐢ㄦ椂:", time.Since(t1))
+ t1 = time.Now()
s.GetFaceFea()
logger.Debug("GetFaceFea鐢ㄦ椂:", time.Since(t1))
if s.Result == nil{
@@ -89,18 +91,12 @@
}
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()
if picMat.Rows() > 1000 || picMat.Cols() > 1000 {
gocv.Resize(picMat,&newMat, image.Pt(0,0), 0.5, 0.5, gocv.InterpolationDefault)
@@ -108,6 +104,7 @@
}
defer picMat.Close()
+
if picMat.Empty() {
logger.Debug("file not exist")
return nil,errors.New("picMat is empty")
@@ -129,18 +126,13 @@
}
func ImgCompress(i *protomsg.Image) ([]byte,error){
- t1 := time.Now()
if b, err := proto.Marshal(i); err != nil {
logger.Debug("protoImage marshal err")
return nil,err
} else {
- logger.Debug("proto.Marshal鐢ㄦ椂锛�", time.Since(t1))
- t1 = time.Now()
bc := make([]byte, len(b))
ht := make([]int, 64<<10)
n, err := lz4.CompressBlock(b, bc, ht)
- logger.Debug("lz4.CompressBlock鐢ㄦ椂锛�", time.Since(t1))
- t1 = time.Now()
if err != nil {
logger.Debug(err)
return nil,err
@@ -150,7 +142,6 @@
return nil,errors.New("compressed len is 0")
}
bc = bc[:n]
- logger.Debug("bc鐢ㄦ椂锛�", time.Since(t1))
return bc,nil
}
}
@@ -280,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