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 | 171 ++++++++++++++++++--------------------------------------
1 files changed, 55 insertions(+), 116 deletions(-)
diff --git a/service/FaceSdkService.go b/service/FaceSdkService.go
index fefcae5..ff918f7 100644
--- a/service/FaceSdkService.go
+++ b/service/FaceSdkService.go
@@ -2,135 +2,74 @@
import (
"basic.com/pubsub/protomsg.git"
- "basic.com/valib/deliver.git"
- "fmt"
+ "basic.com/valib/godraw.git"
+ "basic.com/valib/logger.git"
+ "bytes"
"github.com/gogo/protobuf/proto"
- "github.com/pierrec/lz4"
- "github.com/satori/go.uuid"
"image"
- "io/ioutil"
- "os"
"time"
)
+type FaceSdkService struct {
+ File []byte
+ Id int64
+ Result []*protomsg.ResultFaceDetect
+ DeadTime time.Duration
+}
+
const (
- Url_Service_PUSH = "ipc:///tmp///virtual-faceextract-sdk-pull_2.ipc"
- Url_Service_PULL = "ipc:///tmp///virtual-faceextract-sdk-pull_1.ipc"
+ faceExtractWebCID = "virtual-face-extract-web-camera-id"
)
-var imgPushChan chan protomsg.Recvmsg
-var client_push deliver.Deliver
-var client_pull deliver.Deliver
-func TestPushImgMsg() {
- InitService()
- proImg := readImgFile()
-
- if b, err := proto.Marshal(&proImg);err !=nil{
- fmt.Println("protoImage marshal err")
- return
+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 {
- bc := make([]byte,len(b))
- ht := make([]int, 64<<10)
- n,err := lz4.CompressBlock(b,bc,ht)
- if err !=nil {
- fmt.Println(err)
- }
- if n >= len(b){
- fmt.Println("image is not compressible")
- }
- bc = bc[:n]
- for {
- PushImgMsg(protomsg.Recvmsg{
- Id:uuid.NewV4().String(),
- Addr:"",
- Picdata:bc,
- })
- fmt.Println("pushed img")
- time.Sleep(10*time.Second)
- }
-
+ return detectResults,nil,i
}
}
-func readImgFile() protomsg.Image{
- var i protomsg.Image
+func newFaceSdkService(fileBytes []byte, deadTime time.Duration) *FaceSdkService{
+ return &FaceSdkService{
+ File:fileBytes,
+ Id:time.Now().UnixNano(),
+ DeadTime:deadTime,
+ }
+}
+
+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")
- filePath := "/home/user/workspace/timg.jpg"
- file, err := os.Open(filePath)
- defer file.Close()
- if err !=nil{
- fmt.Println("image not exist")
- return i
- } else {
- img, _, err := image.Decode(file)
- bytes, err := ioutil.ReadFile(filePath)
- if err !=nil {
- return i
- }
- b := img.Bounds()
- width := b.Max.X
- height := b.Max.Y
- i = protomsg.Image{
- Width:int32(width),
- Height:int32(height),
- Timestamp:formatTimeStr,
- Data:bytes,
- }
- return i
- }
+ return &protomsg.Image{
+ Width: int32(img.Bounds().Dx()),
+ Height: int32(img.Bounds().Dy()),
+ Timestamp: formatTimeStr,
+ Data: bgr,
+ Id: s.Id,
+ Cid: faceExtractWebCID,
+ },nil
}
-
-func PushImgMsg(is protomsg.Recvmsg){
- imgPushChan <- is
-}
-
-var resultMap map[string]protomsg.SdkMessage
-
-
-func InitService(){
- fmt.Println("service init!")
- imgPushChan = make(chan protomsg.Recvmsg)
- client_push = deliver.NewClient(deliver.PushPull, Url_Service_PUSH)
- client_pull = deliver.NewClient(deliver.PushPull, Url_Service_PULL)
- defer func() {
- client_push.Close()
- client_pull.Close()
- }()
- go thSend()
-
- go thRecv()
-}
-
-func thSend(){
- for {
- select {
- case is := <- imgPushChan:
- fmt.Println("imgPushChan in")
- b, _ := proto.Marshal(&is)
- err := client_push.Send(b)
- if err !=nil {
- fmt.Println("img Send err:",err)
- }
- default:
- //fmt.Println("no img in")
- }
- }
-}
-
-func thRecv(){
- 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
- }
-
- }
-}
\ No newline at end of file
--
Gitblit v1.8.0