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 | 304 +++++++++----------------------------------------
1 files changed, 59 insertions(+), 245 deletions(-)
diff --git a/service/FaceSdkService.go b/service/FaceSdkService.go
index 6008c1d..366ab3d 100644
--- a/service/FaceSdkService.go
+++ b/service/FaceSdkService.go
@@ -2,81 +2,82 @@
import (
"basic.com/pubsub/protomsg.git"
- "basic.com/valib/deliver.git"
- "encoding/base64"
- "fmt"
+ "basic.com/valib/logger.git"
"github.com/gogo/protobuf/proto"
- "github.com/pierrec/lz4"
"github.com/pkg/errors"
- "github.com/satori/go.uuid"
"gocv.io/x/gocv"
- "io/ioutil"
- "mime/multipart"
- "sync"
"time"
)
type FaceSdkService struct {
- File *multipart.File
- Id string
- Result []*protomsg.ResultFaceExtCom
+ 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"
)
-func NewFaceSdkService(file multipart.File) FaceSdkService{
- return FaceSdkService{
- File:&file,
- Id:uuid.NewV4().String(),
- }
-}
-
-var imgPushChan chan []byte
-var client_push deliver.Deliver
-var client_pull deliver.Deliver
-
-func TestPushImgMsg() {
- InitService()
-
- i := readTestImgFile()
-
- 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)
-
- bc, err := ImgCompress(&i)
- if err !=nil {
- fmt.Println("image is not compressible")
- } else {
- var s FaceSdkService
- s.PushImgMsg(bc)
- }
-}
-
-func (s *FaceSdkService) ReadFromUploadImg() (*protomsg.Image,error){
- defer (*(s.File)).Close()
- imgB, err := ioutil.ReadAll(*(s.File))
+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{
- fmt.Println("File.Read err:",err)
- return nil,err
+ logger.Debug("readFromUploadImg err:",err)
+ return nil,err,i
}
-
- fmt.Println("imgB.len:",len(imgB))
-
- picMat, err := gocv.IMDecode(imgB, gocv.IMReadColor)
+ imgBytes, err := proto.Marshal(i)
if err !=nil {
- fmt.Println("gocv.IMDecode err:",err)
+ 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 newFaceSdkService(fileBytes []byte, deadTime time.Duration) *FaceSdkService{
+ return &FaceSdkService{
+ File:fileBytes,
+ Id:time.Now().UnixNano(),
+ DeadTime:deadTime,
+ }
+}
+
+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()))
+
+ //鍥剧墖缂╁皬鍒嗚鲸鐜�
+ //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() {
- fmt.Println("file not exist")
+ logger.Debug("file not exist")
return nil,errors.New("picMat is empty")
}
height := int32(picMat.Rows())
@@ -90,194 +91,7 @@
Height: height,
Timestamp: formatTimeStr,
Data: data,
- Id: timeUnix,
- Cid:s.Id,
+ Id: s.Id,
+ Cid: faceExtractWebCID,
},nil
-}
-
-func ImgCompress(i *protomsg.Image) ([]byte,error){
- if b, err := proto.Marshal(i); err != nil {
- fmt.Println("protoImage marshal err")
- return nil,err
- } else {
- bc := make([]byte, len(b))
- ht := make([]int, 64<<10)
- n, err := lz4.CompressBlock(b, bc, ht)
- if err != nil {
- fmt.Println(err)
- return nil,err
- }
- if n >= len(b) {
- fmt.Println("image is not compressible")
- return nil,errors.New("compressed len is 0")
- }
- bc = bc[:n]
- return bc,nil
- }
-}
-
-func (s *FaceSdkService) GetFaceFea(){
- var wg sync.WaitGroup
- wg.Add(1)
- ticker := time.NewTicker(time.Second * 3)
- go func(ticker *time.Ticker, s *FaceSdkService) {
- defer ticker.Stop()
- defer wg.Done()
-
- for {
- select {
- case <-ticker.C:
- return
- default:
- if feas,ok := resultMap.Get(s.Id);ok {
- s.Result = feas
- return
- }
- }
- }
- }(ticker, s)
- wg.Wait()
-}
-
-func readTestImgFile() protomsg.Image{
- var i protomsg.Image
- 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,
- Timestamp: formatTimeStr,
- Data: data,
- Id: timeUnix,
- }
- i.Cid = uuid.NewV4().String() //鏁版嵁鍞竴id
- fmt.Println("gocv read img completed")
- return i
-}
-
-func (s *FaceSdkService) PushImgMsg(is []byte){
- imgPushChan <- is
-}
-
-type FeaResult struct {
- FeaM map[string][]*protomsg.ResultFaceExtCom
- Lock sync.Mutex
-}
-
-func (f *FeaResult) Write(id string,faceResult []*protomsg.ResultFaceExtCom){
- f.Lock.Lock()
- defer f.Lock.Unlock()
- f.FeaM[id] = faceResult
-}
-
-func (f *FeaResult) Get(id string) ([]*protomsg.ResultFaceExtCom,bool){
- f.Lock.Lock()
- defer f.Lock.Unlock()
- coms,ok := f.FeaM[id]
- return coms,ok
-}
-
-var resultMap = FeaResult{}
-
-func InitService() {
- fmt.Println("service init!")
- imgPushChan = make(chan []byte)
- resultMap.FeaM = make(map[string][]*protomsg.ResultFaceExtCom,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{
- 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"{
- 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))
- if len(pff.ExtComp) >0 {
- resultMap.Write(perId,pff.ExtComp)
-
- for _,fea :=range pff.ExtComp{
- base64Fea := base64.StdEncoding.EncodeToString(fea.Feats)
- fmt.Println("perId:",perId)
- fmt.Println("faceFeature:",base64Fea)
- }
- }
- }
- break
- }
- }
- }
- } else {
- fmt.Println("recv msg Err:", err)
- }
-
- }
}
--
Gitblit v1.8.0