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 | 215 +++++++++++++----------------------------------------
1 files changed, 55 insertions(+), 160 deletions(-)
diff --git a/service/FaceSdkService.go b/service/FaceSdkService.go
index fcfb269..ff918f7 100644
--- a/service/FaceSdkService.go
+++ b/service/FaceSdkService.go
@@ -2,179 +2,74 @@
import (
"basic.com/pubsub/protomsg.git"
- "basic.com/valib/deliver.git"
- "encoding/base64"
- "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"
- "gocv.io/x/gocv"
+ "image"
"time"
)
+type FaceSdkService struct {
+ File []byte
+ Id int64
+ Result []*protomsg.ResultFaceDetect
+ DeadTime time.Duration
+}
+
const (
- Ipc_Push_Ext = "_2.ipc"
- Ipc_Pull_Ext = "_1.ipc"
- Ipc_Url_Pre = "ipc:///tmp///"
- Virtual_FaceTaskId = "92496BDF-2BFA-98F2-62E8-96DD9866ABD2"
- Virtual_FaceSdkId = "virtual-faceextract-sdk-pull"
- Url_Service_PUSH = Ipc_Url_Pre + Virtual_FaceSdkId + Ipc_Push_Ext
- Url_Service_PULL = Ipc_Url_Pre + Virtual_FaceSdkId + Ipc_Pull_Ext
+ faceExtractWebCID = "virtual-face-extract-web-camera-id"
)
-var imgPushChan chan []byte
-var client_push deliver.Deliver
-var client_pull deliver.Deliver
-func TestPushImgMsg() {
- InitService()
-
- i := readImgFile()
-
- fmt.Printf("width:%d,height:%d,data.length:%d,timestamp:%s,id:%d\n",i.Width,i.Height,len(i.Data),i.Timestamp,i.Id)
- if b, err := proto.Marshal(&i);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(bc)
- fmt.Println("pushed img")
- time.Sleep(5*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"
- picMat := gocv.IMRead(filePath, gocv.IMReadColor)
-
- defer picMat.Close()
-
- if picMat.Empty() {
- fmt.Println("file not exist")
- return i
- }
- height := int32(picMat.Rows())
- width := int32(picMat.Cols())
- data := picMat.ToBytes()
- //wrMat,_ := gocv.NewMatFromBytes(picMat.Rows(),picMat.Cols(),gocv.MatTypeCV8UC3,data)
- //
- //gocv.IMWrite("xxx.jpg", wrMat)
-
- i = protomsg.Image{
- Width: width,
- Height: height,
+ return &protomsg.Image{
+ Width: int32(img.Bounds().Dx()),
+ Height: int32(img.Bounds().Dy()),
Timestamp: formatTimeStr,
- Data: data,
- Id: timeUnix,
- }
- i.Cid = uuid.NewV4().String()//鏁版嵁鍞竴id
- fmt.Println("gocv read img completed")
- return i
+ Data: bgr,
+ Id: s.Id,
+ Cid: faceExtractWebCID,
+ },nil
}
-
-func PushImgMsg(is []byte){
- imgPushChan <- is
-}
-
-var resultMap map[string]protomsg.SdkMessage
-
-
-func InitService(){
- fmt.Println("service init!")
- imgPushChan = make(chan []byte)
- resultMap = make(map[string]protomsg.SdkMessage,0)
- 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 d := <- imgPushChan:
- fmt.Println("imgPushChan in")
- err := client_push.Send(d)
- 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("received MSG:",rMsg.Cid)
- perId := rMsg.Cid //鏁版嵁id
- if rMsg.Tasklab !=nil && rMsg.Tasklab.Taskid == Virtual_FaceTaskId {
- sdkInfos := rMsg.Tasklab.Sdkinfos
- fmt.Println("Len(sdkInfos)=",len(sdkInfos))
- for _,swt :=range sdkInfos{
- fmt.Println("sdkName:",swt.SdkName)
- if swt.Sdktype =="FaceDetect"{
- fmt.Println("浜鸿劯妫�娴嬬粨鏋�")
- var pfp protomsg.ParamFacePos
- err := proto.Unmarshal(swt.Sdkdata, &pfp)
- if err !=nil {
- fmt.Println("faceDetect result unmarshal err:",err)
- } else {
- for _,face :=range pfp.Faces{
- fmt.Println("FacePos:",face.Pos)
- fmt.Println("ThftResult:",face.Result)
- }
- }
- }
- if swt.Sdktype == "FaceExtract"{
- fmt.Println("sdkData.len:",len(swt.Sdkdata))
- var pff protomsg.ParamFaceFeature
- if err := proto.Unmarshal(swt.Sdkdata, &pff);err !=nil{
- //fmt.Println("ParamFaceFeature unmarshal err:",err)
- } else {
- fmt.Println("鐩爣鏁帮細",len(pff.ExtComp))
- for _,fea :=range pff.ExtComp{
- base64Fea := base64.StdEncoding.EncodeToString(fea.Feats)
- fmt.Println("perId:",perId)
- fmt.Println("faceFeature:",base64Fea)
- }
- }
- break
- }
- }
-
- }
- //resultMap[rMsg.Cid] = rMsg
- } else {
- fmt.Println("recv msg Err:",err)
- }
-
- }
-}
\ No newline at end of file
--
Gitblit v1.8.0