From 7c811247ecf143e08c576986a884bedadc57dd66 Mon Sep 17 00:00:00 2001
From: liuxiaolong <liuxiaolong@aiotlink.com>
Date: 星期五, 05 六月 2020 18:29:41 +0800
Subject: [PATCH] add refresh token to resp
---
service/FaceSdkService.go | 85 +++++++++++++++++++++++++++++++-----------
1 files changed, 63 insertions(+), 22 deletions(-)
diff --git a/service/FaceSdkService.go b/service/FaceSdkService.go
index d1bd50f..ff918f7 100644
--- a/service/FaceSdkService.go
+++ b/service/FaceSdkService.go
@@ -1,34 +1,75 @@
package service
import (
- "basic.com/valib/deliver.git"
- "github.com/gin-gonic/gin/internal/json"
+ "basic.com/pubsub/protomsg.git"
+ "basic.com/valib/godraw.git"
+ "basic.com/valib/logger.git"
+ "bytes"
+ "github.com/gogo/protobuf/proto"
+ "image"
+ "time"
)
-type ImageSource struct {
- Id string `json:"id"`
- Data []byte `json:"data"`
+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 imgChan chan ImageSource
-func PushImgMsg(is ImageSource){
- imgChan <- is
+
+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
+ }
+ imgBytes, err := proto.Marshal(i)
+ if err !=nil {
+ logger.Debug("i marshal err:",err)
+ return nil,err,i
+ }
+ 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 InitService(){
- imgChan = make(chan ImageSource)
- client := deliver.NewClient(deliver.PushPull, Url_Service_PUSH)
- for {
- select {
- case is := <- imgChan:
- b, _ := json.Marshal(is)
- client.Send(b)
- }
-
-
+func newFaceSdkService(fileBytes []byte, deadTime time.Duration) *FaceSdkService{
+ return &FaceSdkService{
+ File:fileBytes,
+ Id:time.Now().UnixNano(),
+ DeadTime:deadTime,
}
+}
-}
\ No newline at end of file
+func (s *FaceSdkService) readFromUploadImg() (*protomsg.Image,error){
+ bt := bytes.NewBuffer(s.File)
+ img, _, err := image.Decode(bt)
+ if err != nil {
+ return nil, err
+ }
+ bgr := godraw.Image2BGR(img)
+
+ timeUnix := time.Now().Unix()
+ formatTimeStr := time.Unix(timeUnix, 0).Format("2006-01-02 15:04:05")
+
+ return &protomsg.Image{
+ Width: int32(img.Bounds().Dx()),
+ Height: int32(img.Bounds().Dy()),
+ Timestamp: formatTimeStr,
+ Data: bgr,
+ Id: s.Id,
+ Cid: faceExtractWebCID,
+ },nil
+}
--
Gitblit v1.8.0