From 263c7b18ce7f18f1222318f6e0e499e907895a52 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期三, 13 十一月 2019 19:33:39 +0800
Subject: [PATCH] fix
---
service/FaceSdkService.go | 129 ++++++++++++++++++++++++------------------
1 files changed, 74 insertions(+), 55 deletions(-)
diff --git a/service/FaceSdkService.go b/service/FaceSdkService.go
index 6970479..366ab3d 100644
--- a/service/FaceSdkService.go
+++ b/service/FaceSdkService.go
@@ -2,77 +2,96 @@
import (
"basic.com/pubsub/protomsg.git"
- "basic.com/valib/deliver.git"
- "encoding/json"
- "fmt"
+ "basic.com/valib/logger.git"
"github.com/gogo/protobuf/proto"
- "github.com/satori/go.uuid"
- "io/ioutil"
+ "github.com/pkg/errors"
+ "gocv.io/x/gocv"
"time"
)
+type FaceSdkService struct {
+ File []byte
+ Id int64
+ Result []*protomsg.ResultFaceDetect
+ DeadTime time.Duration
+}
+
const (
- Url_Service_PUSH = "tcp:///tmp///webserver-2.ipc"
- Url_Service_PULL = "tcp:///tmp///webserver-1.ipc"
+ faceExtractWebCID = "virtual-face-extract-web-camera-id"
)
-var imgPushChan chan protomsg.Recvmsg
-func TestPushImgMsg() {
- InitService()
- imgData := readImgFile()
- fmt.Println("imgData.len:",len(imgData))
- for {
- PushImgMsg(protomsg.Recvmsg{
- Id:uuid.NewV4().String(),
- Addr:"",
- Picdata:imgData,
- })
- fmt.Println("pushed img")
- time.Sleep(5*time.Second)
+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))
+ if err !=nil{
+ logger.Debug("readFromUploadImg err:",err)
+ return nil,err,i
}
-}
-
-func readImgFile() []byte{
- filePath := "/home/user/workspace/timg.jpg"
- bytes, err := ioutil.ReadFile(filePath)
+ imgBytes, err := proto.Marshal(i)
if err !=nil {
- fmt.Println("Read img err:",err)
+ logger.Debug("i marshal err:",err)
+ return nil,err,i
}
- return bytes
+ detectResults, err := DoFDetectWithRpc(&protomsg.FaceDetectRequest{ReqParam: imgBytes}, deadTime)
+ logger.Debug("鎻愬彇face鍏辩敤鏃讹細", time.Since(t1))
+ if err !=nil {
+ logger.Debug("DoFDetectWithRpc err:",err)
+ return nil,err,i
+ } else {
+ return detectResults,nil,i
+ }
}
-func PushImgMsg(is protomsg.Recvmsg){
- imgPushChan <- is
+func newFaceSdkService(fileBytes []byte, deadTime time.Duration) *FaceSdkService{
+ return &FaceSdkService{
+ File:fileBytes,
+ Id:time.Now().UnixNano(),
+ DeadTime:deadTime,
+ }
}
-var resultMap map[string]protomsg.SdkMessage
-
-
-func InitService(){
- imgPushChan = make(chan protomsg.Recvmsg)
- client_push := deliver.NewClient(deliver.PushPull, Url_Service_PUSH)
- client_pull := deliver.NewClient(deliver.PushPull, Url_Service_PULL)
- for {
- select {
- case is := <- imgPushChan:
- b, _ := json.Marshal(is)
- client_push.Send(b)
- }
+func (s *FaceSdkService) readFromUploadImg() (*protomsg.Image,error){
+ 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()))
- //鎺ユ敹浜鸿劯鎻愬彇缁撴灉
- for {
- resultBytes, err := client_pull.Recv()
- if err !=nil{
- fmt.Println("pull err:",err)
- continue
- }
- rMsg := protomsg.SdkMessage{}
- if err := proto.Unmarshal(resultBytes, &rMsg);err !=nil{
- fmt.Println("recv MSG:",rMsg)
- resultMap[rMsg.Cid] = rMsg
- }
+ //鍥剧墖缂╁皬鍒嗚鲸鐜�
+ //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")
}
+ height := int32(picMat.Rows())
+ width := int32(picMat.Cols())
+ data := picMat.ToBytes()
+ timeUnix := time.Now().Unix()
+ formatTimeStr := time.Unix(timeUnix, 0).Format("2006-01-02 15:04:05")
-}
\ No newline at end of file
+ return &protomsg.Image{
+ Width: width,
+ Height: height,
+ Timestamp: formatTimeStr,
+ Data: data,
+ Id: s.Id,
+ Cid: faceExtractWebCID,
+ },nil
+}
--
Gitblit v1.8.0